chart2/source/inc/DataSeriesHelper.hxx | 5
chart2/source/inc/LifeTime.hxx | 17 -
chart2/source/inc/ModifyListenerHelper.hxx | 20 -
chart2/source/view/main/VTitle.cxx | 14 -
chart2/source/view/main/VTitle.hxx | 2
dbaccess/source/core/inc/table.hxx | 1
editeng/source/items/frmitems.cxx | 6
include/comphelper/servicehelper.hxx | 10
include/editeng/lrspitem.hxx | 21 -
include/svx/sdtmfitm.hxx | 5
include/vcl/toolkit/treelist.hxx | 1
sc/inc/postit.hxx | 2
sc/source/core/data/postit.cxx | 9
sc/source/filter/xml/XMLExportSharedData.cxx | 6
sc/source/filter/xml/XMLExportSharedData.hxx | 1
sc/source/ui/inc/impex.hxx | 1
sd/Library_sd.mk | 1
sd/source/filter/eppt/pptx-animations-nodectx.hxx | 1
sd/source/ui/app/sdxfer.cxx | 6
sd/source/ui/inc/SlideSorter.hxx | 22 --
sd/source/ui/inc/sdxfer.hxx | 1
sd/source/ui/inc/tools/ConfigurationAccess.hxx | 38 ---
sd/source/ui/inc/tools/PropertySet.hxx | 109 ---------
sd/source/ui/slidesorter/controller/SlsProperties.cxx | 43 ---
sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx | 54 ----
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 13 -
sd/source/ui/tools/ConfigurationAccess.cxx | 60 -----
sd/source/ui/tools/PropertySet.cxx | 153 --------------
sfx2/inc/guisaveas.hxx | 2
sw/inc/hintids.hxx | 1
sw/inc/hints.hxx | 11 -
sw/source/ui/misc/pagenumberdlg.cxx | 5
sw/source/uibase/inc/pagenumberdlg.hxx | 1
vcl/Library_vclplug_gen.mk | 1
vcl/inc/pdf/pdfwriter_impl.hxx | 2
vcl/inc/unx/saldisp.hxx | 7
vcl/inc/unx/salgdi.h | 11 -
vcl/source/treelist/treelist.cxx | 15 -
vcl/unx/generic/app/saldisp.cxx | 36 ---
vcl/unx/generic/gdi/salgdi2.cxx | 88 --------
40 files changed, 1 insertion(+), 801 deletions(-)
New commits:
commit e2c7a6bd572644b928704f6cb3696b568ac0aba1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Apr 19 13:17:17 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Apr 19 19:18:51 2023 +0200
loplugin::unusedmethods
Change-Id: I6a07860edb13588b83345babeb53675aedc43f7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150607
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/inc/DataSeriesHelper.hxx
b/chart2/source/inc/DataSeriesHelper.hxx
index 16bd9d771973..b1f4e0ba3441 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -94,11 +94,6 @@ getAllDataSequences(
OOO_DLLPUBLIC_CHARTTOOLS rtl::Reference< ::chart::DataSource >
getDataSource( const std::vector< rtl::Reference< ::chart::DataSeries > >
& aSeries );
-/** Get the label of a labeled sequence including necessary automatic
generation
- */
-OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence(
- const css::uno::Reference< css::chart2::data::XLabeledDataSequence > &
xLabeledSeq );
-
OOO_DLLPUBLIC_CHARTTOOLS void setStackModeAtSeries(
const std::vector< rtl::Reference< ::chart::DataSeries > > & aSeries,
const rtl::Reference< ::chart::BaseCoordinateSystem > &
xCorrespondingCoordinateSystem,
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index fb9dd7a7f0b6..e16edd1e595a 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -193,23 +193,6 @@ private:
LifeTimeGuard& operator= ( const LifeTimeGuard& ) = delete;
};
-template<class T>
-class NegativeGuard final
-{
- T * m_pT;
-public:
-
- NegativeGuard(T & t) : m_pT(&t)
- {
- m_pT->release();
- }
-
- ~NegativeGuard()
- {
- m_pT->acquire();
- }
-};
-
}//end namespace apphelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx
b/chart2/source/inc/ModifyListenerHelper.hxx
index 9f0dd68aadc1..ee90d407a66f 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -197,16 +197,6 @@ void addListenerToAllMapElements(
impl::addListenerToMappedElementFunctor< typename
Container::value_type >( xListener ));
}
-template< typename T >
-void addListenerToAllSequenceElements(
- const css::uno::Sequence< T > & rSequence,
- const css::uno::Reference< css::util::XModifyListener > & xListener )
-{
- if( xListener.is())
- std::for_each( rSequence.begin(), rSequence.end(),
- impl::addListenerFunctor< T >( xListener ));
-}
-
template< class InterfaceRef >
void removeListener(
const InterfaceRef & xObject,
@@ -259,16 +249,6 @@ void removeListenerFromAllMapElements(
impl::removeListenerFromMappedElementFunctor<
typename Container::value_type >( xListener ));
}
-template< typename T >
-void removeListenerFromAllSequenceElements(
- const css::uno::Sequence< T > & rSequence,
- const css::uno::Reference< css::util::XModifyListener > & xListener )
-{
- if( xListener.is())
- std::for_each( rSequence.begin(), rSequence.end(),
- impl::removeListenerFunctor< T >( xListener ));
-}
-
} // namespace chart::ModifyListenerHelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/VTitle.cxx
b/chart2/source/view/main/VTitle.cxx
index e820e75f9c8b..e251fe95971c 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -105,20 +105,6 @@ bool VTitle::isVisible(const rtl::Reference< Title >&
xTitle) {
return bShow;
}
-bool VTitle::isVisible(const uno::Reference< XTitle >& xTitle) {
- if (!xTitle.is()) {
- return false;
- }
- bool bShow = true;
- try {
- uno::Reference< beans::XPropertySet > xTitleProps(xTitle,
uno::UNO_QUERY_THROW);
- xTitleProps->getPropertyValue("Visible") >>= bShow;
- } catch (const uno::Exception &) {
- DBG_UNHANDLED_EXCEPTION("chart2");
- }
- return bShow;
-}
-
void VTitle::createShapes(
const awt::Point& rPos
diff --git a/chart2/source/view/main/VTitle.hxx
b/chart2/source/view/main/VTitle.hxx
index a0c999dae957..792d7f6a0a5c 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -54,8 +54,6 @@ public:
css::awt::Size getUnrotatedSize() const;
css::awt::Size getFinalSize() const;
void changePosition( const css::awt::Point& rPos );
- static bool isVisible(
- const css::uno::Reference< css::chart2::XTitle > & xTitle);
static bool isVisible(
const rtl::Reference< ::chart::Title > & xTitle);
diff --git a/dbaccess/source/core/inc/table.hxx
b/dbaccess/source/core/inc/table.hxx
index fea6e6e7f080..6c71e7447653 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -114,7 +114,6 @@ namespace dbaccess
//XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
override;
- static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
// css::lang::XServiceInfo
DECLARE_SERVICE_INFO();
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 0c72c9d95d7b..de1515380ed5 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -86,12 +86,6 @@ using namespace ::com::sun::star::table::BorderLineStyle;
SfxPoolItem* SvxPaperBinItem::CreateDefault() { return new
SvxPaperBinItem(0);}
SfxPoolItem* SvxSizeItem::CreateDefault() { return new SvxSizeItem(0);}
-SfxPoolItem* SvxLeftMarginItem::CreateDefault() { return new
SvxLeftMarginItem(0); }
-SfxPoolItem* SvxTextLeftMarginItem::CreateDefault() { return new
SvxTextLeftMarginItem(0); }
-SfxPoolItem* SvxFirstLineIndentItem::CreateDefault() { return new
SvxFirstLineIndentItem(0); }
-SfxPoolItem* SvxRightMarginItem::CreateDefault() { return new
SvxRightMarginItem(0); }
-SfxPoolItem* SvxGutterLeftMarginItem::CreateDefault() { return new
SvxGutterLeftMarginItem(0); }
-SfxPoolItem* SvxGutterRightMarginItem::CreateDefault() { return new
SvxGutterRightMarginItem(0); }
SfxPoolItem* SvxLRSpaceItem::CreateDefault() { return new SvxLRSpaceItem(0);}
SfxPoolItem* SvxULSpaceItem::CreateDefault() { return new SvxULSpaceItem(0);}
SfxPoolItem* SvxProtectItem::CreateDefault() { return new SvxProtectItem(0);}
diff --git a/include/comphelper/servicehelper.hxx
b/include/comphelper/servicehelper.hxx
index c225494ccf1b..03e7a322c340 100644
--- a/include/comphelper/servicehelper.hxx
+++ b/include/comphelper/servicehelper.hxx
@@ -65,16 +65,6 @@ namespace comphelper {
css::uno::Reference<css::lang::XUnoTunnel>{ xIface,
css::uno::UNO_QUERY });
}
- // Takes an Any
- template <class T> T* getFromUnoTunnel(const css::uno::Any& rAny)
- {
- // For unclear reason, using a Reference ctor taking an Any
- // gives different results compared to use of operator >>=.
- css::uno::Reference<css::lang::XUnoTunnel> xUnoTunnel;
- rAny >>= xUnoTunnel;
- return getFromUnoTunnel<T>(xUnoTunnel);
- }
-
template <typename T>
inline bool isUnoTunnelId(const css::uno::Sequence< sal_Int8 >& rId)
{
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index d20d3e31e644..edab3ef23d73 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -60,13 +60,9 @@ public:
// Query/direct setting of the absolute values
tools::Long GetLeft() const { return m_nLeftMargin; }
- void SetLeftValue(const tools::Long nLeft) { m_nLeftMargin = nLeft; }
sal_uInt16 GetPropLeft() const { return m_nPropLeftMargin; }
- // SfxPoolItem interface ...
- static SfxPoolItem* CreateDefault();
-
explicit SvxLeftMarginItem(const sal_uInt16 nId);
SvxLeftMarginItem(const tools::Long nLeft, const sal_uInt16 nId);
SvxLeftMarginItem(SvxLeftMarginItem const &) = default; // SfxPoolItem
copy function dichotomy
@@ -109,9 +105,6 @@ public:
void SetTextLeft(const tools::Long nL, const sal_uInt16 nProp = 100);
tools::Long GetTextLeft() const;
- // SfxPoolItem interface ...
- static SfxPoolItem* CreateDefault();
-
explicit SvxTextLeftMarginItem(const sal_uInt16 nId);
SvxTextLeftMarginItem(const tools::Long nLeft, const sal_uInt16 nId);
SvxTextLeftMarginItem(SvxTextLeftMarginItem const &) = default; //
SfxPoolItem copy function dichotomy
@@ -158,9 +151,6 @@ public:
void SetTextFirstLineOffsetValue(const short nValue)
{ m_nFirstLineOffset = nValue; }
- // SfxPoolItem interface ...
- static SfxPoolItem* CreateDefault();
-
explicit SvxFirstLineIndentItem(const sal_uInt16 nId);
SvxFirstLineIndentItem(const short nOffset, const sal_uInt16 nId);
SvxFirstLineIndentItem(SvxFirstLineIndentItem const &) = default; //
SfxPoolItem copy function dichotomy
@@ -197,13 +187,9 @@ public:
// Query/direct setting of the absolute values
tools::Long GetRight() const { return m_nRightMargin;}
- void SetRightValue(const tools::Long nR) { m_nRightMargin = nR; }
sal_uInt16 GetPropRight() const { return m_nPropRightMargin; }
- // SfxPoolItem interface ...
- static SfxPoolItem* CreateDefault();
-
explicit SvxRightMarginItem(const sal_uInt16 nId);
SvxRightMarginItem(const tools::Long nRight, const sal_uInt16 nId);
SvxRightMarginItem(SvxRightMarginItem const &) = default; // SfxPoolItem
copy function dichotomy
@@ -238,9 +224,6 @@ public:
void SetGutterMargin(const tools::Long nGutterMargin) { m_nGutterMargin =
nGutterMargin; }
tools::Long GetGutterMargin() const { return m_nGutterMargin; }
- // SfxPoolItem interface ...
- static SfxPoolItem* CreateDefault();
-
explicit SvxGutterLeftMarginItem(const sal_uInt16 nId);
SvxGutterLeftMarginItem(SvxGutterLeftMarginItem const &) = default; //
SfxPoolItem copy function dichotomy
@@ -271,12 +254,8 @@ private:
tools::Long m_nRightGutterMargin = 0;
public:
- void SetRightGutterMargin(const tools::Long nRightGutterMargin) {
m_nRightGutterMargin = nRightGutterMargin; }
tools::Long GetRightGutterMargin() const { return m_nRightGutterMargin; }
- // SfxPoolItem interface ...
- static SfxPoolItem* CreateDefault();
-
explicit SvxGutterRightMarginItem(const sal_uInt16 nId);
SvxGutterRightMarginItem(SvxGutterRightMarginItem const &) = default; //
SfxPoolItem copy function dichotomy
diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx
index 23046442bcf9..f2f4e0024ab8 100644
--- a/include/svx/sdtmfitm.hxx
+++ b/include/svx/sdtmfitm.hxx
@@ -27,11 +27,6 @@ inline SdrMetricItem
makeSdrTextMinFrameHeightItem(tools::Long mnHeight)
return SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, mnHeight);
}
-inline SdrMetricItem makeSdrTextMaxFrameHeightItem(tools::Long mnHeight)
-{
- return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, mnHeight);
-}
-
inline SdrMetricItem makeSdrTextMinFrameWidthItem(tools::Long mnWidth)
{
return SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, mnWidth);
diff --git a/include/vcl/toolkit/treelist.hxx b/include/vcl/toolkit/treelist.hxx
index d4c6da101e6d..d0306ce915a0 100644
--- a/include/vcl/toolkit/treelist.hxx
+++ b/include/vcl/toolkit/treelist.hxx
@@ -170,7 +170,6 @@ public:
const SvTreeListEntry* GetParent( const SvTreeListEntry* pEntry ) const;
SvTreeListEntry* GetParent( SvTreeListEntry* pEntry );
- SvTreeListEntry* GetRootLevelParent( SvTreeListEntry* pEntry )
const;
const SvTreeListEntries& GetChildList( SvTreeListEntry* pParent ) const;
SvTreeListEntries& GetChildList( SvTreeListEntry* pParent );
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 6b458ad41763..52872b8d650e 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -122,8 +122,6 @@ public:
/** Returns the caption text of this note. */
OUString GetText() const;
- /** Returns true, if the caption text of this note contains line breaks. */
- bool HasMultiLineText() const;
/** Changes the caption text of this note. All text formatting will be
lost. */
void SetText( const ScAddress& rPos, const OUString& rText
);
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 66f034087678..dd1a023445e2 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -533,15 +533,6 @@ OUString ScPostIt::GetText() const
return OUString();
}
-bool ScPostIt::HasMultiLineText() const
-{
- if( const EditTextObject* pEditObj = GetEditTextObject() )
- return pEditObj->GetParagraphCount() > 1;
- if( maNoteData.mxInitData )
- return maNoteData.mxInitData->maSimpleText.indexOf( '\n' ) >= 0;
- return false;
-}
-
void ScPostIt::SetText( const ScAddress& rPos, const OUString& rText )
{
CreateCaptionFromInitData( rPos );
diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx
b/sc/source/filter/xml/XMLExportSharedData.cxx
index 3672edab96ff..b193beb9f97a 100644
--- a/sc/source/filter/xml/XMLExportSharedData.cxx
+++ b/sc/source/filter/xml/XMLExportSharedData.cxx
@@ -110,12 +110,6 @@ void ScMySharedData::SortShapesContainer()
pShapesContainer->Sort();
}
-bool ScMySharedData::HasShapes() const
-{
- return ((pShapesContainer && pShapesContainer->HasShapes()) ||
- (pTableShapes && !pTableShapes->empty()));
-}
-
void ScMySharedData::AddTableShape(const sal_Int32 nTable, const
uno::Reference<drawing::XShape>& xShape)
{
if (!pTableShapes)
diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx
b/sc/source/filter/xml/XMLExportSharedData.hxx
index 3ed25d25136b..7e9e05cc65a3 100644
--- a/sc/source/filter/xml/XMLExportSharedData.hxx
+++ b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -72,7 +72,6 @@ public:
void AddNewShape(const ScMyShape& aMyShape);
void SortShapesContainer();
ScMyShapesContainer* GetShapesContainer() { return pShapesContainer.get();
}
- bool HasShapes() const;
void AddTableShape(const sal_Int32 nTable, const
css::uno::Reference<css::drawing::XShape>& xShape);
ScMyTableShapes* GetTableShapes() { return pTableShapes.get(); }
ScMyDetectiveObjContainer* GetDetectiveObjContainer() { return
pDetectiveObjContainer.get(); }
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index e30182f7e242..c33c151f81c8 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -161,7 +161,6 @@ public:
void SetExportTextOptions( const ScExportTextOptions& options ) {
mExportTextOptions = options; }
bool GetIncludeBOM() const { return mbIncludeBOM; }
- void SetIncludeBOM(bool bVal) { mbIncludeBOM = bVal; }
};
// Helper class for importing clipboard strings as streams.
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 4ffb86b7d461..aeebc8b53b39 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -429,7 +429,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/tools/IconCache \
sd/source/ui/tools/IdleDetection \
sd/source/ui/tools/PreviewRenderer \
- sd/source/ui/tools/PropertySet \
sd/source/ui/tools/SdGlobalResourceContainer \
sd/source/ui/tools/SlotStateListener \
sd/source/ui/tools/TimerBasedTaskExecution \
diff --git a/sd/source/filter/eppt/pptx-animations-nodectx.hxx
b/sd/source/filter/eppt/pptx-animations-nodectx.hxx
index 5e3ac0010602..14aeacd45c99 100644
--- a/sd/source/filter/eppt/pptx-animations-nodectx.hxx
+++ b/sd/source/filter/eppt/pptx-animations-nodectx.hxx
@@ -53,7 +53,6 @@ public:
NodeContext(const css::uno::Reference<css::animations::XAnimationNode>&
xNode,
bool bMainSeqChild, bool bIsIterateChild);
const css::uno::Reference<css::animations::XAnimationNode>& getNode()
const { return mxNode; }
- bool isMainSeqChild() const { return mbMainSeqChild; }
sal_Int16 getEffectNodeType() const { return mnEffectNodeType; }
sal_Int16 getEffectPresetClass() const { return mnEffectPresetClass; }
const OUString& getEffectPresetId() const { return msEffectPresetId; }
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index a6cf586eef65..693dd399c321 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -721,12 +721,6 @@ std::shared_ptr<SdTransferable::UserData>
SdTransferable::GetUserData (const sal
return std::shared_ptr<UserData>();
}
-const css::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelId()
-{
- static const comphelper::UnoIdInit theSdTransferableUnoTunnelId;
- return theSdTransferableUnoTunnelId.getSeq();
-}
-
SdTransferable* SdTransferable::getImplementation( const Reference< XInterface
>& rxData ) noexcept
{
return dynamic_cast<SdTransferable*>(rxData.get());
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index ae51bd518c09..67e376576081 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -68,14 +68,6 @@ public:
SlideSorter(const SlideSorter&) = delete;
SlideSorter& operator=(const SlideSorter&) = delete;
- /** Return whether the called SlideSorter object is valid and calling
- its Get(Model,View,Controller) methods is safe. When <FALSE/> is
- called then no other methods should be called.
- Calling this method should be necessary only during startup and
- shutdown (when that can be detected).
- */
- bool IsValid() const { return mbIsValid;}
-
/** Create a new slide sorter that is strongly coupled to the given view
shell. Use this function for a slide sorter in the left pane.
@param rViewShell
@@ -93,20 +85,6 @@ public:
ScrollAdaptor* pHorizontalScrollBar,
ScrollAdaptor* pVerticalScrollBar);
- /** Create a new slide sorter that is loosely coupled to the given view
- shell. The view shell may even be missing.
- @param rBase
- ViewShellBase object of the enclosing application.
- @param pViewShell
- Supply when at hand.
- @param rParentWindow
- The parent window of the internally created content window and
- scroll bars.
- */
- static std::shared_ptr<SlideSorter> CreateSlideSorter (
- ViewShellBase& rBase,
- vcl::Window& rParentWindow);
-
/** Return the control of the vertical scroll bar.
*/
const VclPtr<ScrollAdaptor>& GetVerticalScrollBar() const { return
mpVerticalScrollBar;}
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 46418992ba1d..d6d382870dbb 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -71,7 +71,6 @@ public:
bool SetTableRTF( SdDrawDocument* );
- static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
static SdTransferable* getImplementation( const
css::uno::Reference< css::uno::XInterface >& rxData ) noexcept;
// SfxListener
diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx
b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
index b86a30fffdab..97b5e92dc041 100644
--- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx
+++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
@@ -54,11 +54,6 @@ public:
const OUString& rsRootName,
const WriteMode eMode);
- ConfigurationAccess(
- const css::uno::Reference<css::uno::XComponentContext>& rxContext,
- const OUString& rsRootName,
- const WriteMode eMode);
-
/** Return a configuration node below the root of the called object.
@param rsPathToNode
The relative path from the root (as given the constructor) to
@@ -97,39 +92,6 @@ public:
const OUString&,
const std::vector<css::uno::Any>&) > Functor;
- /** Execute a functor for all elements of the given container.
- @param rxContainer
- The container is a XNameAccess to a list of the configuration.
- This can be a node returned by GetConfigurationNode().
- @param rArguments
- The functor is called with arguments that are children of each
- element of the container. The set of children is specified in this
- list.
- @param rFunctor
- The functor to be executed for some or all of the elements in
- the given container.
- */
- static void ForAll (
- const css::uno::Reference<css::container::XNameAccess>& rxContainer,
- const ::std::vector<OUString>& rArguments,
- const Functor& rFunctor);
-
- /** Fill a list with the string contents of all sub-elements in the given
container.
- @param rxContainer
- The container is a XNameAccess to a list of the configuration.
- This can be a node returned by GetConfigurationNode().
- @param rsArgument
- This specifies which string children of the elements in the
- container are to be inserted into the list. The specified child
- has to be of type string.
- @param rList
- The list to be filled.
- */
- static void FillList(
- const css::uno::Reference<css::container::XNameAccess>& rxContainer,
- const OUString& rsArgument,
- ::std::vector<OUString>& rList);
-
private:
css::uno::Reference<css::uno::XInterface> mxRoot;
diff --git a/sd/source/ui/inc/tools/PropertySet.hxx
b/sd/source/ui/inc/tools/PropertySet.hxx
deleted file mode 100644
index 04727be0dbe4..000000000000
--- a/sd/source/ui/inc/tools/PropertySet.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <comphelper/compbase.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <map>
-#include <memory>
-
-namespace sd::tools {
-
-typedef ::comphelper::WeakComponentImplHelper <
- css::beans::XPropertySet
-> PropertySetInterfaceBase;
-
-/** A very simple implementation of the XPropertySet interface. It does not
- support constrained properties and thus does not support vetoable
- listeners. It does not support the optional property set info.
-
- In order to use it you have to derive from this class and implement the
- GetPropertyValue() and SetPropertyValue() methods.
-*/
-class PropertySet : public PropertySetInterfaceBase
-{
-public:
- explicit PropertySet();
- virtual ~PropertySet() override;
-
- // XPropertySet
-
- virtual css::uno::Reference<css::beans::XPropertySetInfo>
- SAL_CALL getPropertySetInfo() override;
-
- virtual void SAL_CALL setPropertyValue (
- const OUString& rsPropertyName,
- const css::uno::Any& rsPropertyValue) override;
-
- virtual css::uno::Any SAL_CALL getPropertyValue (const OUString&
rsPropertyName) override;
-
- virtual void SAL_CALL addPropertyChangeListener (
- const OUString& rsPropertyName,
- const css::uno::Reference<css::beans::XPropertyChangeListener>&
rxListener) override;
-
- virtual void SAL_CALL removePropertyChangeListener (
- const OUString& rsPropertyName,
- const css::uno::Reference<css::beans::XPropertyChangeListener>&
rxListener) override;
-
- virtual void SAL_CALL addVetoableChangeListener (
- const OUString& rsPropertyName,
- const css::uno::Reference<css::beans::XVetoableChangeListener>&
rxListener) override;
-
- virtual void SAL_CALL removeVetoableChangeListener (
- const OUString& rsPropertyName,
- const css::uno::Reference<css::beans::XVetoableChangeListener>&
rxListener) override;
-
-protected:
- /** Return the requested property value.
- @throw css::beans::UnknownPropertyException when the
- property is not supported.
- */
- virtual css::uno::Any GetPropertyValue (const OUString& rsPropertyName) =
0;
- /** Set the given property value.
- @return the old value.
- @throw css::beans::UnknownPropertyException when the
- property is not supported.
- */
- virtual css::uno::Any SetPropertyValue (
- const OUString& rsPropertyName,
- const css::uno::Any& rValue) = 0;
-
-private:
- typedef ::std::multimap<OUString,
- css::uno::Reference<css::beans::XPropertyChangeListener> >
ChangeListenerContainer;
- std::unique_ptr<ChangeListenerContainer> mpChangeListeners;
-
- /** Call all listeners that are registered for the given property name.
- Call this method with an empty property name to call listeners that
- are registered for all properties.
- */
- void CallListeners (
- const OUString& rsPropertyName,
- const css::beans::PropertyChangeEvent& rEvent);
-
- /** @throws css::lang::DisposedException when the object has already been
- disposed.
- */
- void ThrowIfDisposed();
-};
-
-} // end of namespace ::sd::tools
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
index f1152a3735e6..e0092816a327 100644
--- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
@@ -24,13 +24,7 @@
namespace sd::slidesorter::controller {
Properties::Properties()
- : mbIsHighlightCurrentSlide(false),
- mbIsShowSelection(true),
- mbIsShowFocus(true),
- mbIsCenterSelection(false),
- mbIsSmoothSelectionScrolling(true),
- mbIsSuspendPreviewUpdatesDuringFullScreenPresentation(true),
-
maBackgroundColor(Application::GetSettings().GetStyleSettings().GetWindowColor()),
+ :
maBackgroundColor(Application::GetSettings().GetStyleSettings().GetWindowColor()),
maTextColor(Application::GetSettings().GetStyleSettings().GetActiveTextColor()),
maSelectionColor(Application::GetSettings().GetStyleSettings().GetHighlightColor()),
maHighlightColor(Application::GetSettings().GetStyleSettings().GetMenuHighlightColor()),
@@ -46,36 +40,6 @@ void Properties::HandleDataChangeEvent()
maHighlightColor =
Application::GetSettings().GetStyleSettings().GetMenuHighlightColor();
}
-void Properties::SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide)
-{
- mbIsHighlightCurrentSlide = bIsHighlightCurrentSlide;
-}
-
-void Properties::SetShowSelection (const bool bIsShowSelection)
-{
- mbIsShowSelection = bIsShowSelection;
-}
-
-void Properties::SetShowFocus (const bool bIsShowFocus)
-{
- mbIsShowFocus = bIsShowFocus;
-}
-
-void Properties::SetCenterSelection (const bool bIsCenterSelection)
-{
- mbIsCenterSelection = bIsCenterSelection;
-}
-
-void Properties::SetSmoothSelectionScrolling (const bool
bIsSmoothSelectionScrolling)
-{
- mbIsSmoothSelectionScrolling = bIsSmoothSelectionScrolling;
-}
-
-void Properties::SetSuspendPreviewUpdatesDuringFullScreenPresentation (const
bool bFlag)
-{
- mbIsSuspendPreviewUpdatesDuringFullScreenPresentation = bFlag;
-}
-
void Properties::SetBackgroundColor (const Color& rColor)
{
maBackgroundColor = rColor;
@@ -96,11 +60,6 @@ void Properties::SetHighlightColor (const Color& rColor)
maHighlightColor = rColor;
}
-void Properties::SetUIReadOnly (const bool bIsUIReadOnly)
-{
- mbIsUIReadOnly = bIsUIReadOnly;
-}
-
} // end of namespace ::sd::slidesorter::controller
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index 344ac67f38bd..1a57670d62f7 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
@@ -35,51 +35,6 @@ public:
*/
void HandleDataChangeEvent();
- /** When this method returns <TRUE/> then the current slide is
- highlighted in the view. The default value is <FALSE/>.
- */
- bool IsHighlightCurrentSlide() const { return mbIsHighlightCurrentSlide; }
- void SetHighlightCurrentSlide(const bool bIsHighlightCurrentSlide);
-
- /** When this method returns <TRUE/> then the selection is indicated in
- the view (typically by drawing rectangles around the selected
- slides.) The default value is <TRUE/>.
- */
- bool IsShowSelection() const { return mbIsShowSelection; }
- void SetShowSelection(const bool bIsShowSelection);
-
- /** When this method returns <TRUE/> then the focusdselection is indicated
in
- the view (typically by drawing dotted rectangles around the selected
- slides.) The default value is <TRUE/>.
- */
- bool IsShowFocus() const { return mbIsShowFocus; }
- void SetShowFocus(const bool bIsShowFocus);
-
- /** When this method returns <TRUE/> then on a selection change the
- visible area is adapted so that the selected slides are shown
- centered in the view. This can be used to center the current slide
- by selecting only the current slide. The default value is <FALSE/>.
- */
- bool IsCenterSelection() const { return mbIsCenterSelection; }
- void SetCenterSelection(const bool bIsCenterSelection);
-
- /** When this method returns <TRUE/> then the view may try to change the
- visible area by scrolling it smoothly on the screen. Experimental.
- Default value is <FALSE/>.
- */
- bool IsSmoothSelectionScrolling() const { return
mbIsSmoothSelectionScrolling; }
- void SetSmoothSelectionScrolling(const bool bIsSmoothSelectionScrolling);
-
- /** When this method returns <TRUE/> then during a full screen
- presentation the previews in a slide sorter are not updated.
- Default value is <TRUE/>.
- */
- bool IsSuspendPreviewUpdatesDuringFullScreenPresentation() const
- {
- return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;
- }
- void SetSuspendPreviewUpdatesDuringFullScreenPresentation(const bool
bFlag);
-
/** Return the background color.
*/
const Color& GetBackgroundColor() const { return maBackgroundColor; }
@@ -87,7 +42,6 @@ public:
/** Return the text color.
*/
- const Color& GetTextColor() const { return maTextColor; }
void SetTextColor(const Color& rColor);
/** Return the color in which selections are to be painted.
@@ -97,22 +51,14 @@ public:
/** Return the color used for highlighting e.g. the current slide.
*/
- const Color& GetHighlightColor() const { return maHighlightColor; }
void SetHighlightColor(const Color& rColor);
/** The UI can be set to be read only independently from the model status.
Used for instance in the presenter view.
*/
bool IsUIReadOnly() const { return mbIsUIReadOnly; }
- void SetUIReadOnly(const bool bIsUIReadOnly);
private:
- bool mbIsHighlightCurrentSlide;
- bool mbIsShowSelection;
- bool mbIsShowFocus;
- bool mbIsCenterSelection;
- bool mbIsSmoothSelectionScrolling;
- bool mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;
Color maBackgroundColor;
Color maTextColor;
Color maSelectionColor;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 6fc906ded600..b29f5e054432 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -83,19 +83,6 @@ std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter(
return pSlideSorter;
}
-std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter (
- ViewShellBase& rBase,
- vcl::Window& rParentWindow)
-{
- std::shared_ptr<SlideSorter> pSlideSorter(
- new SlideSorter(
- rBase,
- rParentWindow),
- o3tl::default_delete<SlideSorter>());
- pSlideSorter->Init();
- return pSlideSorter;
-}
-
SlideSorter::SlideSorter (
ViewShell& rViewShell,
sd::Window* pContentWindow,
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx
b/sd/source/ui/tools/ConfigurationAccess.cxx
index d3fd2fa5a096..35ccadba3783 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -33,16 +33,6 @@ using namespace ::com::sun::star::uno;
namespace sd::tools {
-ConfigurationAccess::ConfigurationAccess (
- const Reference<XComponentContext>& rxContext,
- const OUString& rsRootName,
- const WriteMode eMode)
-{
- Reference<lang::XMultiServiceFactory> xProvider =
- configuration::theDefaultProvider::get( rxContext );
- Initialize(xProvider, rsRootName, eMode);
-}
-
ConfigurationAccess::ConfigurationAccess (
const OUString& rsRootName,
const WriteMode eMode)
@@ -118,56 +108,6 @@ void ConfigurationAccess::CommitChanges()
xConfiguration->commitChanges();
}
-void ConfigurationAccess::ForAll (
- const Reference<container::XNameAccess>& rxContainer,
- const ::std::vector<OUString>& rArguments,
- const Functor& rFunctor)
-{
- if (!rxContainer.is())
- return;
-
- ::std::vector<Any> aValues(rArguments.size());
- const Sequence<OUString> aKeys (rxContainer->getElementNames());
- for (const OUString& rsKey : aKeys)
- {
- Reference<container::XNameAccess> xSetItem
(rxContainer->getByName(rsKey), UNO_QUERY);
- if (xSetItem.is())
- {
- // Get from the current item of the container the children
- // that match the names in the rArguments list.
- for (size_t nValueIndex=0; nValueIndex<aValues.size();
++nValueIndex)
- aValues[nValueIndex] =
xSetItem->getByName(rArguments[nValueIndex]);
- }
- rFunctor(rsKey, aValues);
- }
-}
-
-void ConfigurationAccess::FillList(
- const Reference<container::XNameAccess>& rxContainer,
- const OUString& rsArgument,
- ::std::vector<OUString>& rList)
-{
- try
- {
- if (rxContainer.is())
- {
- Sequence<OUString> aKeys (rxContainer->getElementNames());
- rList.resize(aKeys.getLength());
- for (sal_Int32 nItemIndex=0; nItemIndex<aKeys.getLength();
++nItemIndex)
- {
- Reference<container::XNameAccess> xSetItem (
- rxContainer->getByName(aKeys[nItemIndex]), UNO_QUERY);
- if (xSetItem.is())
- {
- xSetItem->getByName(rsArgument) >>= rList[nItemIndex];
- }
- }
- }
- }
- catch (RuntimeException&)
- {}
-}
-
} // end of namespace sd::tools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/tools/PropertySet.cxx
b/sd/source/ui/tools/PropertySet.cxx
deleted file mode 100644
index c50a617de1b0..000000000000
--- a/sd/source/ui/tools/PropertySet.cxx
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <tools/PropertySet.hxx>
-#include <algorithm>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-namespace sd::tools {
-
-PropertySet::PropertySet()
- : mpChangeListeners(new ChangeListenerContainer)
-{
-}
-
-PropertySet::~PropertySet()
-{
-}
-
-//----- XPropertySet ----------------------------------------------------------
-
-Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo()
-{
- return nullptr;
-}
-
-void SAL_CALL PropertySet::setPropertyValue (
- const OUString& rsPropertyName,
- const css::uno::Any& rsPropertyValue)
-{
- ThrowIfDisposed();
-
- Any aOldValue (SetPropertyValue(rsPropertyName,rsPropertyValue));
- if (aOldValue == rsPropertyValue)
- return;
-
- // Inform listeners that are registered specifically for the
- // property and those registered for any property.
- beans::PropertyChangeEvent aEvent(
- static_cast<XWeak*>(this),
- rsPropertyName,
- false,
- -1,
- aOldValue,
- rsPropertyValue);
- CallListeners(rsPropertyName, aEvent);
- CallListeners(OUString(), aEvent);
-}
-
-Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName)
-{
- ThrowIfDisposed();
-
- return GetPropertyValue(rsPropertyName);
-}
-
-void SAL_CALL PropertySet::addPropertyChangeListener (
- const OUString& rsPropertyName,
- const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-{
- if ( ! rxListener.is())
- throw lang::IllegalArgumentException();
-
- if (m_bDisposed)
- return;
-
- mpChangeListeners->emplace(rsPropertyName, rxListener);
-}
-
-void SAL_CALL PropertySet::removePropertyChangeListener (
- const OUString& rsPropertyName,
- const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-{
-
::std::pair<ChangeListenerContainer::iterator,ChangeListenerContainer::iterator>
- aRange (mpChangeListeners->equal_range(rsPropertyName));
-
- ChangeListenerContainer::iterator iListener (
- ::std::find_if(
- aRange.first,
- aRange.second,
- [&rxListener] (const ChangeListenerContainer::value_type&
listener) {
- return listener.second == rxListener;
- }));
-
- if (iListener == mpChangeListeners->end())
- {
- throw lang::IllegalArgumentException();
- }
-
- mpChangeListeners->erase(iListener);
-
-}
-
-void SAL_CALL PropertySet::addVetoableChangeListener (
- const OUString&,
- const css::uno::Reference<css::beans::XVetoableChangeListener>&)
-{
- // Constraint properties are not supported and thus no vetoable
- // listeners.
-}
-
-void SAL_CALL PropertySet::removeVetoableChangeListener (
- const OUString&,
- const css::uno::Reference<css::beans::XVetoableChangeListener>&)
-{
- // Constraint properties are not supported and thus no vetoable
- // listeners.
-}
-
-void PropertySet::CallListeners (
- const OUString& rsPropertyName,
- const beans::PropertyChangeEvent& rEvent)
-{
-
::std::pair<ChangeListenerContainer::iterator,ChangeListenerContainer::iterator>
- aRange (mpChangeListeners->equal_range(rsPropertyName));
- ChangeListenerContainer::const_iterator iListener;
- for (iListener=aRange.first; iListener!=aRange.second; ++iListener)
- {
- if (iListener->second.is())
- iListener->second->propertyChange(rEvent);
- }
-}
-
-void PropertySet::ThrowIfDisposed()
-{
- if (m_bDisposed)
- {
- throw lang::DisposedException (
- "PropertySet object has already been disposed",
- static_cast<uno::XWeak*>(this));
- }
-}
-
-} // end of namespace ::sd::tools
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 7e848a579313..a1f85bbc2248 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -68,8 +68,6 @@ private:
bool m_bSetStandardName;
sal_Int16 m_nStoreMode;
- DECL_LINK(FilterDialogClosedHdl, css::ui::dialogs::DialogClosedEvent*,
void);
-
static bool
FinishGUIStoreModel(::comphelper::SequenceAsHashMap::const_iterator&
aFileNameIter,
ModelData_Impl& aModelData, bool bRemote,
sal_Int16 nStoreMode,
css::uno::Sequence< css::beans::PropertyValue >&
aFilterProps,
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 0428d5e1258a..1046dab3e1ca 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -143,7 +143,6 @@ class SwTableFormulaUpdate;
class SwAutoFormatGetDocNode;
class SwVirtPageNumInfo;
class SwFindNearestNode;
-class SwStringMsgPoolItem;
class SwFltAnchor;
class SwFltTOX;
class SwFltRedline;
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 4cf9e2464c6d..33b768b6f0c0 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -387,17 +387,6 @@ public:
const SwNode* GetFoundNode() const { return m_pFound; }
};
-class SwStringMsgPoolItem final : public SwMsgPoolItem
-{
- OUString m_sStr;
-public:
-
- const OUString& GetString() const { return m_sStr; }
-
- SwStringMsgPoolItem( sal_uInt16 nId, OUString aStr )
- : SwMsgPoolItem( nId ), m_sStr(std::move( aStr ))
- {}
-};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/pagenumberdlg.cxx
b/sw/source/ui/misc/pagenumberdlg.cxx
index 47e532e18ae6..19402d5a69a7 100644
--- a/sw/source/ui/misc/pagenumberdlg.cxx
+++ b/sw/source/ui/misc/pagenumberdlg.cxx
@@ -43,11 +43,6 @@ SwPageNumberDlg::SwPageNumberDlg(weld::Window* pParent)
IMPL_LINK_NOARG(SwPageNumberDlg, OkHdl, weld::Button&, void) {
m_xDialog->response(RET_OK); }
-IMPL_LINK_NOARG(SwPageNumberDlg, CancelHdl, weld::Button&, void)
-{
- m_xDialog->response(RET_CANCEL);
-}
-
IMPL_LINK_NOARG(SwPageNumberDlg, PositionSelectHdl, weld::ComboBox&, void)
{
m_aPageNumberPosition = m_xPageNumberPosition->get_active();
diff --git a/sw/source/uibase/inc/pagenumberdlg.hxx
b/sw/source/uibase/inc/pagenumberdlg.hxx
index 6e768a3153a2..3faa56421dab 100644
--- a/sw/source/uibase/inc/pagenumberdlg.hxx
+++ b/sw/source/uibase/inc/pagenumberdlg.hxx
@@ -36,7 +36,6 @@ class SwPageNumberDlg final : public SfxDialogController
int m_aPageNumberAlignment;
DECL_LINK(OkHdl, weld::Button&, void);
- DECL_LINK(CancelHdl, weld::Button&, void);
DECL_LINK(PositionSelectHdl, weld::ComboBox&, void);
DECL_LINK(AlignmentSelectHdl, weld::ComboBox&, void);
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index cc94f6f7c09d..193e9c78f16a 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/dtrans/X11_transferable \
vcl/unx/generic/gdi/cairo_xlib_cairo \
vcl/unx/generic/gdi/X11CairoSalGraphicsImpl \
- vcl/unx/generic/gdi/salgdi2 \
vcl/unx/generic/gdi/font \
vcl/unx/generic/gdi/salgdi \
vcl/unx/generic/gdi/salvd \
diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx
index aadb6b204d22..87a5d1387755 100644
--- a/vcl/inc/pdf/pdfwriter_impl.hxx
+++ b/vcl/inc/pdf/pdfwriter_impl.hxx
@@ -1018,8 +1018,6 @@ i12626
bool finalizeSignature();
// writes xref and trailer
bool emitTrailer();
- // emit additional streams collected; also create there object numbers
- bool emitAdditionalStreams();
// emits info dict (if applicable)
sal_Int32 emitInfoDict( );
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 55ebb7046ff3..08f52f996a93 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -142,10 +142,8 @@ public:
const SalDisplay* GetDisplay() const { return m_pDisplay; }
inline Display* GetXDisplay() const;
const SalVisual& GetVisual() const { return m_aVisual; }
- Visual* GetXVisual() const { return m_aVisual.GetVisual(); }
Pixel GetWhitePixel() const { return m_nWhitePixel; }
Pixel GetBlackPixel() const { return m_nBlackPixel; }
- Pixel GetUsed() const { return m_nUsed; }
bool GetXPixels( XColor &rColor,
int r,
@@ -156,7 +154,6 @@ public:
int g,
int b ) const;
Pixel GetPixel( std::optional<Color> nColor ) const;
- Color GetColor( Pixel nPixel ) const;
};
class SalI18N_InputMethod;
@@ -350,18 +347,14 @@ public:
const Size& GetScreenSize( SalX11Screen nXScreen ) const { return
getDataForScreen( nXScreen ).m_aSize; }
srv_vendor_t GetServerVendor() const { return meServerVendor; }
bool IsDisplay() const { return !!pXLib_; }
- GC GetCopyGC( SalX11Screen nXScreen ) const { return
getDataForScreen(nXScreen).m_aCopyGC; }
- Pixmap GetInvert50( SalX11Screen nXScreen ) const { return
getDataForScreen(nXScreen).m_hInvert50; }
const SalColormap& GetColormap( SalX11Screen nXScreen ) const { return
getDataForScreen(nXScreen).m_aColormap; }
const SalVisual& GetVisual( SalX11Screen nXScreen ) const { return
getDataForScreen(nXScreen).m_aVisual; }
const Pair &GetResolution() const { return aResolution_; }
- sal_uLong GetMaxRequestSize() const { return nMaxRequestSize_; }
Time GetLastUserEventTime() const { return GetEventTimeImpl(); }
// this is an equivalent of gdk_x11_get_server_time()
Time GetX11ServerTime() const { return GetEventTimeImpl( true
); }
bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate )
const;
- SalXLib* GetXLib() const { return pXLib_; }
SalI18N_InputMethod* GetInputMethod() const { return
pXLib_->GetInputMethod(); }
SalI18N_KeyboardExtension* GetKbdExtension() const { return
mpKbdExtension; }
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index d8fe250f4df6..35b4d98d076d 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -127,15 +127,6 @@ public:
virtual css::uno::Any
GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const
basegfx::B2ISize& rSize) const override;
#endif // ENABLE_CAIRO_CANVAS
- /* use to handle GraphicsExpose/NoExpose after XCopyArea & friends
- * if pFrame is not NULL, corresponding Paint events are generated
- * and dispatched to pFrame
- *
- * it is imperative to eat up graphics exposes even in case you don't need
- * them because the next one using XCopyArea can depend on them
- */
- void YieldGraphicsExpose();
-
private:
using SalGraphics::GetPixel;
@@ -156,11 +147,9 @@ private:
public:
Drawable GetDrawable() const { return maX11Common.GetDrawable(); }
- const SalColormap& GetColormap() const { return maX11Common.GetColormap();
}
const SalDisplay* GetDisplay() const { return maX11Common.GetDisplay(); }
const SalVisual& GetVisual() const { return maX11Common.GetVisual(); }
Display* GetXDisplay() const { return maX11Common.GetXDisplay(); }
- Pixel GetPixel(Color nColor) const { return maX11Common.GetPixel(nColor); }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index 8f51e343fd98..9cc441d2c249 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -1009,21 +1009,6 @@ void SvTreeList::InvalidateEntry( SvTreeListEntry*
pEntry )
Broadcast( SvListAction::INVALIDATE_ENTRY, pEntry );
}
-SvTreeListEntry* SvTreeList::GetRootLevelParent( SvTreeListEntry* pEntry )
const
-{
- DBG_ASSERT(pEntry,"GetRootLevelParent:No Entry");
- SvTreeListEntry* pCurParent = nullptr;
- if ( pEntry )
- {
- pCurParent = pEntry->pParent;
- if ( pCurParent == pRootItem.get() )
- return pEntry; // is its own parent
- while( pCurParent && pCurParent->pParent != pRootItem.get() )
- pCurParent = pCurParent->pParent;
- }
- return pCurParent;
-}
-
SvListView::SvListView()
: m_pImpl(new Impl(*this))
{
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index f96aba96d100..6d7737cb3224 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2691,42 +2691,6 @@ void SalColormap::GetLookupTable()
m_aLookupTable[i++] = sal_Lookup( m_aPalette, r, g, b, m_nUsed
);
}
-Color SalColormap::GetColor( Pixel nPixel ) const
-{
- if( m_nBlackPixel == nPixel ) return COL_BLACK;
- if( m_nWhitePixel == nPixel ) return COL_WHITE;
-
- if( m_aVisual.GetVisual() )
- {
- if( m_aVisual.GetClass() == TrueColor )
- return m_aVisual.GetTCColor( nPixel );
-
- if( m_aPalette.empty()
- && m_hColormap
- && m_aVisual.GetDepth() <= 12
- && m_aVisual.GetClass() == PseudoColor )
- const_cast<SalColormap*>(this)->GetPalette();
- }
-
- if( !m_aPalette.empty() && nPixel < m_nUsed )
- return m_aPalette[nPixel];
-
- if( !m_hColormap )
- {
- SAL_WARN("vcl", "SalColormap::GetColor() !m_hColormap");
- return Color(ColorTransparency, nPixel);
- }
-
- // DirectColor, StaticColor, StaticGray, GrayScale
- XColor aColor;
-
- aColor.pixel = nPixel;
-
- XQueryColor( m_pDisplay->GetDisplay(), m_hColormap, &aColor );
-
- return Color( aColor.red>>8, aColor.green>>8, aColor.blue>>8 );
-}
-
inline bool SalColormap::GetXPixel( XColor &rColor,
int r,
int g,
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
deleted file mode 100644
index ee96a757acb0..000000000000
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <salgdiimpl.hxx>
-
-#include <vcl/sysdata.hxx>
-
-#include <unx/saldisp.hxx>
-#include <unx/salgdi.h>
-#include <salframe.hxx>
-
-extern "C"
-{
- static Bool GraphicsExposePredicate( Display*, XEvent* pEvent, const
XPointer pFrameWindow )
- {
- Bool bRet = False;
- if( (pEvent->type == GraphicsExpose || pEvent->type == NoExpose) &&
- pEvent->xnoexpose.drawable ==
reinterpret_cast<Drawable>(pFrameWindow) )
- {
- bRet = True;
- }
- return bRet;
- }
-}
-
-void X11SalGraphics::YieldGraphicsExpose()
-{
- // get frame if necessary
- SalFrame* pFrame = m_pFrame;
- Display* pDisplay = GetXDisplay();
- ::Window aWindow = GetDrawable();
- if( ! pFrame )
- {
- for (auto pSalFrame :
vcl_sal::getSalDisplay(GetGenericUnixSalData())->getFrames() )
- {
- const SystemEnvData* pEnvData = pSalFrame->GetSystemData();
- if( Drawable(pEnvData->GetWindowHandle(pSalFrame)) == aWindow )
- {
- pFrame = pSalFrame;
- break;
- }
- }
- if( ! pFrame )
- return;
- }
-
- XEvent aEvent;
- while( XCheckTypedWindowEvent( pDisplay, aWindow, Expose, &aEvent ) )
- {
- SalPaintEvent aPEvt( aEvent.xexpose.x, aEvent.xexpose.y,
aEvent.xexpose.width+1, aEvent.xexpose.height+1 );
- pFrame->CallCallback( SalEvent::Paint, &aPEvt );
- }
-
- do
- {
- if( ! GetDisplay()->XIfEventWithTimeout( &aEvent,
reinterpret_cast<XPointer>(aWindow), GraphicsExposePredicate ) )
- // this should not happen at all; still sometimes it happens
- break;
-
- if( aEvent.type == NoExpose )
- break;
-
- if( pFrame )
- {
- SalPaintEvent aPEvt( aEvent.xgraphicsexpose.x,
aEvent.xgraphicsexpose.y, aEvent.xgraphicsexpose.width+1,
aEvent.xgraphicsexpose.height+1 );
- pFrame->CallCallback( SalEvent::Paint, &aPEvt );
- }
- } while( aEvent.xgraphicsexpose.count != 0 );
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
