[Libreoffice-commits] core.git: chart2/source compilerplugins/clang cui/source include/basic include/desktop include/sfx2 include/svl include/svtools include/svx include/vcl io/source lotuswordpro/source sfx2/source svl/source svtools/source svx/source vcl/source vcl/unx
Noel Grandin
noel at peralex.com
Thu Sep 22 19:00:30 UTC 2016
chart2/source/controller/inc/ChartController.hxx | 1
chart2/source/controller/main/ChartController.cxx | 5 -
compilerplugins/clang/unusedmethods.py | 7 +
cui/source/dialogs/dlgname.cxx | 13 ---
cui/source/inc/cuitabarea.hxx | 17 ----
cui/source/inc/cuitabline.hxx | 1
cui/source/inc/dlgname.hxx | 1
include/basic/sbxvar.hxx | 2
include/desktop/crashreport.hxx | 4
include/sfx2/dialoghelper.hxx | 2
include/sfx2/frame.hxx | 17 ----
include/sfx2/objsh.hxx | 1
include/sfx2/sidebar/ControllerItem.hxx | 4
include/sfx2/templatedlg.hxx | 3
include/sfx2/templatelocalview.hxx | 4
include/sfx2/viewsh.hxx | 4
include/svl/style.hxx | 1
include/svtools/parrtf.hxx | 1
include/svtools/treelist.hxx | 3
include/svx/SvxPresetListBox.hxx | 3
include/svx/dlgctrl.hxx | 8 -
include/svx/fmsrcimp.hxx | 23 -----
include/svx/pagenumberlistbox.hxx | 1
include/svx/svdmodel.hxx | 1
include/svx/xtable.hxx | 2
include/vcl/IContext.hxx | 5 -
include/vcl/builder.hxx | 2
include/vcl/msgbox.hxx | 3
include/vcl/printerinfomanager.hxx | 3
include/vcl/salnativewidgets.hxx | 1
include/vcl/settings.hxx | 1
include/vcl/syswin.hxx | 1
include/vcl/toolbox.hxx | 2
include/vcl/vclenum.hxx | 2
io/source/stm/streamhelper.cxx | 18 ----
io/source/stm/streamhelper.hxx | 2
lotuswordpro/source/filter/bento.hxx | 1
lotuswordpro/source/filter/lwpfoundry.hxx | 4
lotuswordpro/source/filter/lwpuidoc.hxx | 4
sfx2/source/control/templatelocalview.cxx | 47 -----------
sfx2/source/dialog/dialoghelper.cxx | 5 -
sfx2/source/doc/objstor.cxx | 26 ------
sfx2/source/sidebar/ControllerItem.cxx | 5 -
sfx2/source/view/frame.cxx | 51 ------------
sfx2/source/view/viewsh.cxx | 10 --
svl/source/items/style.cxx | 4
svtools/source/svrtf/parrtf.cxx | 1
svx/source/dialog/dlgctrl.cxx | 89 ----------------------
svx/source/dialog/pagenumberlistbox.cxx | 8 -
svx/source/form/fmsrcimp.cxx | 52 ------------
svx/source/tbxctrls/SvxPresetListBox.cxx | 1
svx/source/xoutdev/xtable.cxx | 6 -
vcl/source/app/settings.cxx | 6 -
vcl/unx/generic/printer/printerinfomanager.cxx | 14 ---
54 files changed, 13 insertions(+), 490 deletions(-)
New commits:
commit 7419057e3ec4365748fa6456e207f40fd9e09c62
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 22 16:34:14 2016 +0200
loplugin:unusedmethods in chart2..svx
Change-Id: Ifb6045885049733415895f58cdd911256f48323c
Reviewed-on: https://gerrit.libreoffice.org/29187
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index d6aaaac..336d86a 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -394,7 +394,6 @@ private:
virtual ~TheModel() override;
- void SetOwnership( bool bGetsOwnership );
void addListener( ChartController* pController );
void removeListener( ChartController* pController );
void tryTermination();
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index e15df2d..f537b6b 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -143,11 +143,6 @@ ChartController::TheModel::~TheModel()
{
}
-void ChartController::TheModel::SetOwnership( bool bGetsOwnership )
-{
- m_bOwnership = bGetsOwnership;
-}
-
void ChartController::TheModel::addListener( ChartController* pController )
{
if(m_xCloseable.is())
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index 319e8ad..41044d3 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -233,6 +233,8 @@ for d in definitionSet:
# used by Windows build
if any(x in d[1] for x in ["DdeTopic::", "DdeData::", "DdeService::", "DdeTransaction::", "DdeConnection::", "DdeLink::", "DdeItem::", "DdeGetPutItem::"]):
continue
+ if method == "class tools::SvRef<class FontCharMap> FontCharMap::GetDefaultMap(_Bool)":
+ continue
# too much template magic here for my plugin
if ( ("cairocanvas::" in d[1])
or ("canvas::" in d[1])
@@ -268,9 +270,14 @@ for d in definitionSet:
continue
if "::operator" in d[1]:
continue
+
location = definitionToSourceLocationMap[d];
# whacky template stuff
if location.startswith("sc/source/ui/vba/vbaformat.hxx"): continue
+ # not sure how this stuff is called
+ if location.startswith("include/test"): continue
+ # leave the debug/dump alone
+ if location.startswith("include/oox/dump"): continue
unusedSet.add(d) # used by the "unused return types" analysis
tmp1set.add((method, location))
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 71bd359..6772f44 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -202,19 +202,6 @@ IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button2Hdl, Button*, void)
/*************************************************************************/
-void SvxMessDialog::DisableButton( SvxMessDialogButton nBtnId )
-{
- switch( nBtnId )
- {
- case SvxMessDialogButton::N1:
- pBtn1->Disable();
- break;
- case SvxMessDialogButton::N2:
- pBtn2->Disable();
- break;
- }
-}
-
void SvxMessDialog::SetButtonText( SvxMessDialogButton nBtnId, const OUString& rNewTxt )
{
switch ( nBtnId )
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index ef7ca4c..86f5119 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -103,25 +103,14 @@ public:
void SetNewColorList( XColorListRef const & pColorList )
{ mpNewColorList = pColorList; }
const XColorListRef& GetNewColorList() const { return mpNewColorList; }
- const XColorListRef& GetColorList() const { return mpColorList; }
- void SetNewGradientList( XGradientListRef const & pGrdLst)
- { mpNewGradientList = pGrdLst; }
const XGradientListRef& GetNewGradientList() const
{ return mpNewGradientList; }
- void SetNewHatchingList( XHatchListRef const & pHtchLst)
- { mpNewHatchingList = pHtchLst; }
const XHatchListRef& GetNewHatchingList() const
{ return mpNewHatchingList; }
- void SetNewBitmapList( XBitmapListRef const & pBmpLst)
- { mpNewBitmapList = pBmpLst; }
const XBitmapListRef& GetNewBitmapList() const { return mpNewBitmapList; }
-
- void SetNewPatternList( XPatternListRef const & pPtrnLst )
- { mpNewPatternList = pPtrnLst; }
- const XPatternListRef& GetNewPatternList() const { return mpNewPatternList; }
};
/************************************************************************/
@@ -810,7 +799,6 @@ public:
void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef );
void SetColorList( const XColorListRef& pColList );
- const XColorListRef& GetColorList() { return pColorList; }
void SetPageType( PageType* pInType ) { pPageType = pInType; }
void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
@@ -821,10 +809,6 @@ public:
virtual void FillUserData() override;
- bool IsModified()
- {
- return bool(*pnColorListState & ChangeType::MODIFIED);
- }
void SetModified(bool bIsModified)
{
if (bIsModified)
@@ -836,7 +820,6 @@ public:
{
*pnColorListState |= nState;
}
- void Update(bool bLoaded);
};
#endif // INCLUDED_CUI_SOURCE_INC_CUITABAREA_HXX
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index edbb252..fc84623 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -78,7 +78,6 @@ public:
void SetNewColorList( XColorListRef const & pColTab ) { mpNewColorList = pColTab; }
const XColorListRef& GetNewColorList() const { return mpNewColorList; }
- const XColorListRef& GetColorList() const { return pColorList; }
};
/*************************************************************************/
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index ab57fe5..07dc6d0 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -145,7 +145,6 @@ public:
SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = nullptr );
virtual ~SvxMessDialog() override;
virtual void dispose() override;
- void DisableButton( SvxMessDialogButton nBtnId);
void SetButtonText( SvxMessDialogButton nBtnId, const OUString& rNewTxt );
};
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 60ab190..0ad7169 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -119,8 +119,6 @@ public:
const SbxValues& GetValues_Impl() const { return aData; }
bool Put( const SbxValues& );
- SbxValues * data() { return &aData; }
-
sal_Unicode GetChar() const;
sal_Int16 GetInteger() const;
sal_Int32 GetLong() const;
diff --git a/include/desktop/crashreport.hxx b/include/desktop/crashreport.hxx
index e58e387..b97dadc 100644
--- a/include/desktop/crashreport.hxx
+++ b/include/desktop/crashreport.hxx
@@ -49,10 +49,6 @@ public:
static void storeExceptionHandler(google_breakpad::ExceptionHandler* pExceptionHandler);
- // when we create the ExceptionHandler we have no access to the user
- // profile yet, so update when we have access
- static void updateMinidumpLocation();
-
private:
static osl::Mutex maMutex;
diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx
index 1d2a2a9..5201113 100644
--- a/include/sfx2/dialoghelper.hxx
+++ b/include/sfx2/dialoghelper.hxx
@@ -32,8 +32,6 @@ Size SFX2_DLLPUBLIC getParagraphPreviewOptimalSize(const vcl::Window *pReference
Size SFX2_DLLPUBLIC getDrawPreviewOptimalSize(const vcl::Window *pReference);
-Size SFX2_DLLPUBLIC getDrawListBoxOptimalSize(const vcl::Window *pReference);
-
Size SFX2_DLLPUBLIC getPreviewStripSize(const vcl::Window *pReference);
Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference);
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index fcd9330..98bd845 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -128,9 +128,6 @@ public:
static SfxFrame* GetFirst();
static SfxFrame* GetNext( SfxFrame& );
- static const SfxPoolItem*
- OpenDocumentSynchron( SfxItemSet& aSet, const css::uno::Reference< css::frame::XFrame >& i_rTargetFrame );
-
SfxObjectShell* GetCurrentDocument() const;
SfxViewFrame* GetCurrentViewFrame() const;
SfxFrame& GetTopFrame() const;
@@ -190,20 +187,6 @@ private:
typedef SvCompatWeakRef<SfxFrame> SfxFrameWeakRef;
-class SfxFrameIterator
-{
- const SfxFrame* pFrame;
- bool bRecursive;
-
- SfxFrame* NextSibling_Impl( SfxFrame& rPrev );
-
-public:
- SfxFrameIterator( const SfxFrame& rFrame, bool bRecursive=true );
- SfxFrame* FirstFrame();
- SfxFrame* NextFrame( SfxFrame& rPrev );
-};
-
-
class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem
{
SfxFrame* pFrame;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4a464d3..1b9dfaf 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -433,7 +433,6 @@ public:
static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc );
virtual bool PrepareClose(bool bUI = true);
- bool IsInformationLost();
virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates );
sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent );
bool IsSecurityOptOpenReadOnly() const;
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index b984792..7623022 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -94,10 +94,6 @@ public:
*/
void RequestUpdate();
- /** Return the icon for the command.
- */
- Image GetIcon() const;
-
/** Do not call. Used by local class only. Should be a member of
a local and hidden interface.
*/
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index acb1521..3054b22 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -101,9 +101,6 @@ protected:
void createDefaultTemplateMenu ();
- // Exchange view between local/online view.
- void switchMainView (bool bDisplayLocal);
-
/**
*
* Move templates stored in the filesystem to another folder.
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 300330c..45e31a7 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -129,8 +129,6 @@ public:
bool moveTemplates (const std::set<const ThumbnailViewItem*,selection_cmp_fn> &rItems, const sal_uInt16 nTargetItem);
- bool copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail, const OUString &rPath);
-
bool copyFrom(TemplateContainerItem *pItem, const OUString &rPath);
bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName);
@@ -147,8 +145,6 @@ public:
sal_uInt16 getCurRegionId () const { return mnCurRegionId;}
- const OUString& getCurRegionName () const { return maCurRegionName;}
-
void setOpenRegionHdl(const Link<void*,void> &rLink);
void setCreateContextMenuHdl(const Link<ThumbnailViewItem*,void> &rLink);
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index a1fea9b..27744e3 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -329,12 +329,8 @@ public:
void libreOfficeKitViewCallback(int nType, const char* pPayload) const override;
/// Set if we are doing tiled searching.
void setTiledSearching(bool bTiledSearching);
- /// Are we doing tiled searching?
- bool isTiledSearching() const;
/// Set if we are doing tiled painting.
void setTiledPainting(bool bTiledPainting);
- /// Are we doing tiled painting?
- bool isTiledPainting() const;
/// See lok::Document::getPart().
virtual int getPart() const;
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 62b4afa..48e4586 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -95,7 +95,6 @@ protected:
SfxStyleSheetBase( const SfxStyleSheetBase& );
virtual ~SfxStyleSheetBase() override;
virtual void Load( SvStream&, sal_uInt16 );
- void Store( SvStream& );
public:
diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx
index 7206a31..d2539d4 100644
--- a/include/svtools/parrtf.hxx
+++ b/include/svtools/parrtf.hxx
@@ -54,7 +54,6 @@ protected:
void ReadUnknownData();
void ReadBitmapData();
- void ReadOLEData();
virtual ~SvRTFParser() override;
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 1c48679..d83deee 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -141,9 +141,6 @@ public:
void InsertView( SvListView* );
void RemoveView( SvListView* );
- SvListView* GetView( sal_uLong nPos ) const
- { return ( nPos < aViewList.size() ) ? aViewList[ nPos ] : nullptr; }
-
void Broadcast(
SvListAction nActionId,
SvTreeListEntry* pEntry1=nullptr,
diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index aa05380..7f1c1fc 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -31,7 +31,6 @@ class SVX_DLLPUBLIC SvxPresetListBox : public ValueSet
{
private:
sal_uInt32 nColCount;
- sal_uInt32 nRowCount;
Size aIconSize;
Link<SvxPresetListBox*,void> maRenameHdl;
Link<SvxPresetListBox*,void> maDeleteHdl;
@@ -49,8 +48,6 @@ public:
sal_uInt32 getColumnCount() const { return nColCount; }
Size const & GetIconSize() const { return aIconSize; }
- void setColumnCount( const sal_uInt32 nCount ) { nColCount = nCount; }
- void setRowCount( const sal_uInt32 nRow ) { nRowCount = nRow; }
void SetRenameHdl( const Link<SvxPresetListBox*,void>& rLink )
{
maRenameHdl = rLink;
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 190c996..8d92361 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -229,9 +229,6 @@ public:
explicit HatchingLB(vcl::Window* pParent, WinBits aWB);
void Fill( const XHatchListRef &pList );
-
- void Append( const XHatchEntry& rEntry, const Bitmap& rBitmap );
- void Modify( const XHatchEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap );
};
/************************************************************************/
@@ -244,8 +241,6 @@ public:
void Fill( const XGradientListRef &pList );
- void Append( const XGradientEntry& rEntry, const Bitmap& rBitmap );
- void Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap );
void SelectEntryByList( const XGradientListRef &pList, const OUString& rStr,
const XGradient& rXGradient );
};
@@ -259,9 +254,6 @@ public:
void Fill(const XBitmapListRef &pList);
- void Append(const Size& rSize, const XBitmapEntry& rEntry);
- void Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_Int32 nPos);
-
private:
BitmapEx maBitmapEx;
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 7190ef0..ffcb6c13 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -39,23 +39,6 @@
#include <vector>
/**
- * class FmSearchThread
- */
-class FmSearchEngine;
-class SAL_WARN_UNUSED FmSearchThread : public ::osl::Thread
-{
- FmSearchEngine* m_pEngine;
- Link<FmSearchThread*,void> m_aTerminationHdl;
-
- virtual void SAL_CALL run() override;
- virtual void SAL_CALL onTerminated() override;
-
-public:
- FmSearchThread(FmSearchEngine* pEngine) : m_pEngine(pEngine) { }
- void setTerminationHandler(Link<FmSearchThread*,void> aHdl) { m_aTerminationHdl = aHdl; }
-};
-
-/**
* struct FmSearchProgress - the owner of SearchEngine receives this structure for status updates
* (at the end of the search)
*/
@@ -360,14 +343,10 @@ private:
SVX_DLLPRIVATE bool MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
// moves the iterator with respect to the direction/overflow iterator/overflow cursor
SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const css::uno::Reference< css::container::XIndexAccess >& xAllFields, sal_Int32 nField);
- // builds a FieldInfo in relation to field number nField (in xAllFields) and adds it to m_arrUsedFields
- // xAllFields needs to support the DatabaseRecord service
- SVX_DLLPRIVATE OUString FormatField(const FieldInfo& rField);
- // formats the field with the NumberFormatter
SVX_DLLPRIVATE bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); }
- DECL_LINK_TYPED(OnSearchTerminated, FmSearchThread*, void);
+ void OnSearchTerminated();
// is used by SearchThread, after the return from this handler the thread removes itself
DECL_LINK_TYPED(OnNewRecordCount, sal_Int32, void);
};
diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx
index 1f0b4f1..0cc32c4 100644
--- a/include/svx/pagenumberlistbox.hxx
+++ b/include/svx/pagenumberlistbox.hxx
@@ -29,7 +29,6 @@ public:
PageNumberListBox( vcl::Window* pParent );
void SetSelection( sal_uInt16 );
- sal_uInt16 GetSelection() const;
Size GetOptimalSize() const override;
};
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 5a49fee..14299d2 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -137,7 +137,6 @@ public:
const SdrPage* GetPage() const { return mpPage;}
const SdrObject* GetObject() const { return mpObj;}
SdrHintKind GetKind() const { return meHint;}
- const Rectangle& GetRectangle() const { return maRectangle;}
};
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index d8c1b2f..1d781b9 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -214,10 +214,8 @@ public:
void SetDirty(bool bDirty) { mbListDirty = bDirty; }
bool IsEmbedInDocument() const { return mbEmbedInDocument; }
- void SetEmbedInDocument(bool b) { mbEmbedInDocument = b; }
static OUString GetDefaultExt(XPropertyListType t);
- static OUString GetDefaultExtFilter(XPropertyListType t);
OUString GetDefaultExt() const { return GetDefaultExt(meType); }
virtual css::uno::Reference< css::container::XNameContainer >
diff --git a/include/vcl/IContext.hxx b/include/vcl/IContext.hxx
index 09f9722..446a845 100644
--- a/include/vcl/IContext.hxx
+++ b/include/vcl/IContext.hxx
@@ -38,11 +38,6 @@ public:
return true;
}
- const std::vector< vcl::EnumContext::Context >& GetContext() const
- {
- return maContext;
- }
-
private:
std::vector<vcl::EnumContext::Context> maContext;
};
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 33f42da..02a9018 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -448,8 +448,6 @@ public:
static OUString getUIRootDir();
bool hasBuilder() const { return m_pUIBuilder != nullptr; }
- css::uno::Reference<css::frame::XFrame> getFrame() { return m_pUIBuilder->getFrame(); }
-
template <typename T> T* get(VclPtr<T>& ret, const OString& sID)
{
return m_pUIBuilder->get<T>(ret, sID);
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 225e96b..6ef4976 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -96,9 +96,6 @@ public:
class VCL_DLLPUBLIC QueryBox : public MessBox
{
-private:
- SAL_DLLPRIVATE void ImplInitQueryBoxData();
-
public:
QueryBox( vcl::Window* pParent, WinBits nStyle,
const OUString& rMessage );
diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
index 77ab898..49482bd 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -145,9 +145,6 @@ public:
virtual void setupJobContextData( JobData& rData );
- // changes the info about a named printer
- virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo );
-
// check if the printer configuration has changed
// if bwait is true, then this method waits for eventual asynchronous
// printer discovery to finish
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 5d5bd1c..673341c 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -420,7 +420,6 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue
bool isBothAligned() const { return isLeftAligned() && isRightAligned(); }
bool isNotAligned() const { return !(mnAlignment & (TabitemFlags::LeftAligned | TabitemFlags::RightAligned)); }
bool isFirst() const { return bool(mnAlignment & TabitemFlags::FirstInGroup); }
- bool isLast() const { return bool(mnAlignment & TabitemFlags::LastInGroup); }
const Rectangle& getContentRect() const { return maContentRect; }
};
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index e01ae46..38f7eb0 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -429,7 +429,6 @@ public:
bool GetContextMenuShortcuts() const;
void SetPreferredContextMenuShortcuts( bool bContextMenuShortcuts );
- bool GetPreferredContextMenuShortcuts() const;
void SetPrimaryButtonWarpsSlider( bool bPrimaryButtonWarpsSlider );
bool GetPrimaryButtonWarpsSlider() const;
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 211a4e9..90b42fd 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -178,7 +178,6 @@ public:
private:
SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin );
virtual void setPosSizeOnContainee(Size aSize, Window &rBox);
- bool ImplHandleCmdEvent ( const CommandEvent& rCEvent );
DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void );
protected:
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index e8c5a92..51053e3 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -402,8 +402,6 @@ public:
/// Shows or hides items.
void ShowItem(sal_uInt16 nItemId, bool bVisible = true);
- /// Overload to provide ShowItem via command id.
- void ShowItem(const OUString& rCommand, bool bVisible) { ShowItem(GetItemId(rCommand), bVisible); }
/// Convenience method to hide items (via ShowItem).
void HideItem(sal_uInt16 nItemId) { ShowItem( nItemId, false ); }
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 3324b3d..8397ec2 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -94,7 +94,7 @@ inline bool operator ==(const ItalicMatrix& a, const ItalicMatrix& b)
inline bool operator !=(const ItalicMatrix& a, const ItalicMatrix& b)
{
- return a.xx != b.xx || a.xy != b.xy || a.yx != b.yx || a.yy != b.yy;
+ return !(a == b);
}
enum class VclAlign
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index 2e358a5..ac06afa 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -177,24 +177,6 @@ void MemRingBuffer::forgetFromStart( sal_Int32 nBytesToForget ) throw (css::io::
}
-void MemRingBuffer::shrink() throw ()
-{
- checkInvariants();
-
- // Up to now, only shrinking of while buffer works.
- // No other shrinking supported up to now.
- if( ! m_nOccupiedBuffer ) {
- if( m_p ) {
- free( m_p );
- }
- m_p = nullptr;
- m_nBufferLen = 0;
- m_nStart = 0;
- }
-
- checkInvariants();
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 519d0e7..11f6556 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -47,8 +47,6 @@ public:
sal_Int32 getSize() const throw();
void forgetFromStart(sal_Int32 nBytesToForget) throw(css::io::BufferSizeExceededException);
- void shrink() throw();
-
private:
void resizeBuffer(sal_Int32 nMinSize) throw(css::io::BufferSizeExceededException);
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index 96e6714..ebe0931 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -177,7 +177,6 @@ public:
public: // Overridden methods
/* added by */
- CBenValue * GetValue(){ return cpValue; };
sal_uLong GetSize() { return m_ulValueLength; };
protected: // Overridden methods
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx
index b5d4966..19e6d23 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/source/filter/lwpfoundry.hxx
@@ -79,9 +79,7 @@ class LwpBookMark;
class LwpVersionManager
{
public:
- LwpVersionManager(){}
- ~LwpVersionManager(){}
-public:
+ LwpVersionManager() = delete;
static void Read(LwpObjectStream *pStrm);
static void Skip(LwpObjectStream *pStrm);
};
diff --git a/lotuswordpro/source/filter/lwpuidoc.hxx b/lotuswordpro/source/filter/lwpuidoc.hxx
index e2e9ddb..b2ee705 100644
--- a/lotuswordpro/source/filter/lwpuidoc.hxx
+++ b/lotuswordpro/source/filter/lwpuidoc.hxx
@@ -77,9 +77,7 @@ class LwpMergeOptions;
class LwpNamedProperties
{
public:
- LwpNamedProperties(){}
- ~LwpNamedProperties(){}
-public:
+ LwpNamedProperties() = delete;
static void Read(LwpObjectStream *pStrm);
};
/**
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 331c222..758ce11 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -701,53 +701,6 @@ bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, s
return ret;
}
-bool TemplateLocalView::copyFrom(const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail,
- const OUString &rPath)
-{
- for (TemplateContainerItem* pRegion : maRegions)
- {
- if (pRegion->mnId == nRegionItemId)
- {
- sal_uInt16 nId = 0;
- sal_uInt16 nDocId = 0;
-
- TemplateContainerItem *pRegionItem =
- pRegion;
-
- if (!pRegionItem->maTemplates.empty())
- {
- nId = (pRegionItem->maTemplates.back()).nId+1;
- nDocId = (pRegionItem->maTemplates.back()).nDocId+1;
- }
-
- OUString aPath(rPath);
- sal_uInt16 nRegionId = pRegion->mnRegionId;
-
- if (mpDocTemplates->CopyFrom(nRegionId,nDocId,aPath))
- {
- TemplateItemProperties aTemplate;
- aTemplate.nId = nId;
- aTemplate.nDocId = nDocId;
- aTemplate.nRegionId = nRegionId;
- aTemplate.aName = aPath;
- aTemplate.aRegionName = getRegionName(nRegionId);
- aTemplate.aThumbnail = rThumbnail;
- aTemplate.aPath = mpDocTemplates->GetPath(nRegionId,nDocId);
-
- TemplateContainerItem *pItem = pRegion;
-
- pItem->maTemplates.push_back(aTemplate);
-
- return true;
- }
-
- break;
- }
- }
-
- return false;
-}
-
bool TemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString &rPath)
{
sal_uInt16 nId = 1;
diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx
index 554238d..fe0044e 100644
--- a/sfx2/source/dialog/dialoghelper.cxx
+++ b/sfx2/source/dialog/dialoghelper.cxx
@@ -63,11 +63,6 @@ Size getDrawPreviewOptimalSize(const vcl::Window *pReference)
return pReference->LogicToPixel(Size(88, 42), MAP_APPFONT);
}
-Size getDrawListBoxOptimalSize(const vcl::Window *pReference)
-{
- return pReference->LogicToPixel(Size(88, 110), MAP_APPFONT);
-}
-
Size getPreviewStripSize(const vcl::Window *pReference)
{
return pReference->LogicToPixel(Size(70 , 40), MapMode(MAP_APPFONT));
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index eec5ca7..0bcb90b 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2875,32 +2875,6 @@ bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ )
}
-bool SfxObjectShell::IsInformationLost()
-{
- Sequence< PropertyValue > aProps = GetModel()->getArgs();
- OUString aFilterName;
- OUString aPreusedFilterName;
- for ( sal_Int32 nInd = 0; nInd < aProps.getLength(); nInd++ )
- {
- if ( aProps[nInd].Name == "FilterName" )
- aProps[nInd].Value >>= aFilterName;
- else if ( aProps[nInd].Name == "PreusedFilterName" )
- aProps[nInd].Value >>= aPreusedFilterName;
- }
-
- // if current filter can lead to information loss and it was used
- // for the latest store then the user should be asked to store in own format
- if ( !aFilterName.isEmpty() && aFilterName.equals( aPreusedFilterName ) )
- {
- std::shared_ptr<const SfxFilter> pFilt = GetMedium()->GetFilter();
- DBG_ASSERT( pFilt && aFilterName.equals( pFilt->GetName() ), "MediaDescriptor contains wrong filter!\n" );
- return ( pFilt && pFilt->IsAlienFormat() );
- }
-
- return false;
-}
-
-
bool SfxObjectShell::CanReload_Impl()
/* [Description]
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 5443020..2ea554f 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -179,11 +179,6 @@ void ControllerItem::ResetFrame()
mxFrame = nullptr;
}
-Image ControllerItem::GetIcon() const
-{
- return GetImage(mxFrame, ".uno:" + msCommandName, false);
-}
-
ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface()
{
}
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 009a29a..9c7fcdf 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -648,50 +648,6 @@ bool SfxUnoFrameItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId
return ( rVal >>= m_xFrame );
}
-SfxFrameIterator::SfxFrameIterator( const SfxFrame& rFrame, bool bRecur )
- : pFrame( &rFrame )
- , bRecursive( bRecur )
-{}
-
-SfxFrame* SfxFrameIterator::FirstFrame()
-{
- // GetFirst starts the iteration at the first child frame
- return pFrame->GetChildFrame( 0 );
-}
-
-SfxFrame* SfxFrameIterator::NextFrame( SfxFrame& rPrev )
-{
- // If recursion is requested testing is done first on Children.
- SfxFrame *pRet = nullptr;
- if ( bRecursive )
- pRet = rPrev.GetChildFrame( 0 );
- if ( !pRet )
- {
- // In other case continue with the siblings of rPrev
- pRet = NextSibling_Impl( rPrev );
- }
-
- return pRet;
-}
-
-
-SfxFrame* SfxFrameIterator::NextSibling_Impl( SfxFrame& rPrev )
-{
- SfxFrame *pRet = nullptr;
- if ( &rPrev != pFrame )
- {
- SfxFrameArr_Impl& rArr = *rPrev.pParentFrame->pChildArr;
- SfxFrameArr_Impl::iterator it = std::find( rArr.begin(), rArr.end(), &rPrev );
- if ( it != rArr.end() && (++it) != rArr.end() )
- pRet = *it;
-
- if ( !pRet && rPrev.pParentFrame->pParentFrame )
- pRet = NextSibling_Impl( *rPrev.pParentFrame );
- }
-
- return pRet;
-}
-
css::uno::Reference< css::frame::XController > SfxFrame::GetController() const
{
if ( pImpl->pCurrentViewFrame && pImpl->pCurrentViewFrame->GetViewShell() )
@@ -931,11 +887,4 @@ SfxFrame* SfxFrame::GetNext( SfxFrame& rFrame )
return nullptr;
}
-const SfxPoolItem* SfxFrame::OpenDocumentSynchron( SfxItemSet& i_rSet, const Reference< XFrame >& i_rTargetFrame )
-{
- i_rSet.Put( SfxUnoFrameItem( SID_FILLFRAME, i_rTargetFrame ) );
- i_rSet.ClearItem( SID_TARGETNAME );
- return SfxGetpApp()->GetDispatcher_Impl()->Execute( SID_OPENDOC, SfxCallMode::SYNCHRON, i_rSet );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 78bf0b6..4a851bf 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1503,21 +1503,11 @@ void SfxViewShell::setTiledSearching(bool bTiledSearching)
pImpl->m_bTiledSearching = bTiledSearching;
}
-bool SfxViewShell::isTiledSearching() const
-{
- return pImpl->m_bTiledSearching;
-}
-
void SfxViewShell::setTiledPainting(bool bTiledPainting)
{
pImpl->m_bTiledPainting = bTiledPainting;
}
-bool SfxViewShell::isTiledPainting() const
-{
- return pImpl->m_bTiledPainting;
-}
-
int SfxViewShell::getPart() const
{
return 0;
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 9e69c30..c6cd032 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -855,10 +855,6 @@ void SfxStyleSheetBase::Load( SvStream&, sal_uInt16 )
{
}
-void SfxStyleSheetBase::Store( SvStream& )
-{
-}
-
SfxStyleSheet::SfxStyleSheet(const OUString &rName,
const SfxStyleSheetBasePool& r_Pool,
SfxStyleFamily eFam,
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 987051b..602ef7e 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -554,7 +554,6 @@ _inSkipGroup++;
void SvRTFParser::ReadUnknownData() { SkipGroup(); }
void SvRTFParser::ReadBitmapData() { SkipGroup(); }
-void SvRTFParser::ReadOLEData() { SkipGroup(); }
SvParserState SvRTFParser::CallParser()
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 662f62a..a9c8b59 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1193,34 +1193,6 @@ void HatchingLB::Fill( const XHatchListRef &pList )
SetUpdateMode( true );
}
-void HatchingLB::Append( const XHatchEntry& rEntry, const Bitmap& rBitmap )
-{
- if(!rBitmap.IsEmpty())
- {
- InsertEntry(rEntry.GetName(), Image(rBitmap));
- }
- else
- {
- InsertEntry( rEntry.GetName() );
- }
-
- AdaptDropDownLineCountToMaximum();
-}
-
-void HatchingLB::Modify( const XHatchEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap )
-{
- RemoveEntry( nPos );
-
- if( !rBitmap.IsEmpty() )
- {
- InsertEntry( rEntry.GetName(), Image(rBitmap), nPos );
- }
- else
- {
- InsertEntry( rEntry.GetName(), nPos );
- }
-}
-
// Fills the listbox (provisional) with strings
void FillAttrLB::Fill( const XHatchListRef &pList )
@@ -1286,34 +1258,6 @@ void GradientLB::Fill( const XGradientListRef &pList )
SetUpdateMode( true );
}
-void GradientLB::Append( const XGradientEntry& rEntry, const Bitmap& rBitmap )
-{
- if(!rBitmap.IsEmpty())
- {
- InsertEntry(rEntry.GetName(), Image(rBitmap));
- }
- else
- {
- InsertEntry( rEntry.GetName() );
- }
-
- AdaptDropDownLineCountToMaximum();
-}
-
-void GradientLB::Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap )
-{
- RemoveEntry( nPos );
-
- if(!rBitmap.IsEmpty())
- {
- InsertEntry( rEntry.GetName(), Image(rBitmap), nPos );
- }
- else
- {
- InsertEntry( rEntry.GetName(), nPos );
- }
-}
-
void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUString& rStr,
const XGradient& rGradient )
{
@@ -1457,39 +1401,6 @@ void BitmapLB::Fill( const XBitmapListRef &pList )
SetUpdateMode(true);
}
-void BitmapLB::Append(const Size& rSize, const XBitmapEntry& rEntry)
-{
- maBitmapEx = rEntry.GetGraphicObject().GetGraphic().GetBitmapEx();
-
- if(!maBitmapEx.IsEmpty())
- {
- formatBitmapExToSize(maBitmapEx, rSize);
- InsertEntry(rEntry.GetName(), Image(maBitmapEx));
- }
- else
- {
- InsertEntry(rEntry.GetName());
- }
-
- AdaptDropDownLineCountToMaximum();
-}
-
-void BitmapLB::Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_Int32 nPos)
-{
- RemoveEntry(nPos);
- maBitmapEx = rEntry.GetGraphicObject().GetGraphic().GetBitmapEx();
-
- if(!maBitmapEx.IsEmpty())
- {
- formatBitmapExToSize(maBitmapEx, rSize);
- InsertEntry(rEntry.GetName(), Image(maBitmapEx), nPos);
- }
- else
- {
- InsertEntry(rEntry.GetName());
- }
-}
-
FillAttrLB::FillAttrLB(vcl::Window* pParent, WinBits aWB)
: ColorListBox(pParent, aWB)
{
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index 830139b..d02767a 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -59,14 +59,6 @@ void PageNumberListBox::SetSelection( sal_uInt16 nPos )
SelectEntryPos( ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) ? nSelPos : nUserPos );
}
-sal_uInt16 PageNumberListBox::GetSelection() const
-{
- const sal_Int32 nPos = GetSelectEntryPos();
- sal_uInt16 nData = (sal_uInt16)reinterpret_cast<sal_uLong>(GetEntryData( nPos ));
-
- return nData;
-}
-
Size PageNumberListBox::GetOptimalSize() const
{
return Size(150, ListBox::GetOptimalSize().Height());
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 2d442be..f1f1f49 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -65,23 +65,6 @@ using namespace ::com::sun::star::beans;
using namespace ::svxform;
-// = FmSearchThread
-
-void FmSearchThread::run()
-{
- osl_setThreadName("FmSearchThread");
-
- m_pEngine->SearchNextImpl();
-};
-
-
-void FmSearchThread::onTerminated()
-{
- m_aTerminationHdl.Call(this);
- delete this;
-}
-
-
// = FmRecordCountListener
// SMART_UNO_IMPLEMENTATION(FmRecordCountListener, UsrObject);
@@ -320,37 +303,6 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< css::container::XI
}
-OUString FmSearchEngine::FormatField(const FieldInfo& rField)
-{
- if (!m_xFormatter.is())
- return OUString();
- // sonst werden Datumsflder zum Beispiel zu irgendeinem Default-Wert formatiert
-
- OUString sReturn;
- try
- {
- if (rField.bDoubleHandling)
- {
- double fValue = rField.xContents->getDouble();
- if (!rField.xContents->wasNull())
- sReturn = m_xFormatter->convertNumberToString(rField.nFormatKey, fValue);
- }
- else
- {
- OUString sValue = rField.xContents->getString();
- if (!rField.xContents->wasNull())
- sReturn = m_xFormatter->formatString(rField.nFormatKey, sValue);
- }
- }
- catch(...)
- {
- }
-
-
- return sReturn;
-}
-
-
OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
{
DBG_ASSERT((sal_uInt32)nWhich < m_aControlTexts.size(), "FmSearchEngine::FormatField(sal_Int32) : invalid position !");
@@ -983,7 +935,7 @@ void FmSearchEngine::SearchNextImpl()
}
-IMPL_LINK_NOARG_TYPED(FmSearchEngine, OnSearchTerminated, FmSearchThread*, void)
+void FmSearchEngine::OnSearchTerminated()
{
if (!m_aProgressHandler.IsSet())
return;
@@ -1077,7 +1029,7 @@ void FmSearchEngine::ImplStartNextSearch()
m_bSearchingCurrently = true;
SearchNextImpl();
- LINK(this, FmSearchEngine, OnSearchTerminated).Call(nullptr);
+ OnSearchTerminated();
}
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index 5527812..7ad3b62 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -31,7 +31,6 @@
SvxPresetListBox::SvxPresetListBox(vcl::Window* pParent, WinBits nWinStyle)
: ValueSet(pParent, nWinStyle),
nColCount(3),
- nRowCount(5),
aIconSize( Size(60,64) )
{
SetEdgeBlending(true);
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index c088d34..ecea27c 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -416,10 +416,4 @@ OUString XPropertyList::GetDefaultExt( XPropertyListType t )
return OUString();
}
-OUString XPropertyList::GetDefaultExtFilter( XPropertyListType t )
-{
- OUString aFilter( "*." );
- return aFilter + GetDefaultExt( t );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1c0db67..6a97396 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1541,12 +1541,6 @@ StyleSettings::SetPreferredContextMenuShortcuts( bool bContextMenuShortcuts )
mxData->mbPreferredContextMenuShortcuts = bContextMenuShortcuts;
}
-bool
-StyleSettings::GetPreferredContextMenuShortcuts() const
-{
- return mxData->mbPreferredContextMenuShortcuts;
-}
-
void
StyleSettings::SetPrimaryButtonWarpsSlider( bool bPrimaryButtonWarpsSlider )
{
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 3845d61..1a0c3b2 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -551,20 +551,6 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter
return it != m_aPrinters.end() ? it->second.m_aInfo : aEmptyInfo;
}
-void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
-{
- std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter );
-
- SAL_WARN_IF( it == m_aPrinters.end(), "vcl", "Do not change nonexistent printers" );
-
- if( it != m_aPrinters.end() )
- {
- it->second.m_aInfo = rNewInfo;
- it->second.m_bModified = true;
- writePrinterConfig();
- }
-}
-
// need to check writeability / creatability of config files
static bool checkWriteability( const OUString& rUniPath )
{
More information about the Libreoffice-commits
mailing list