loplugin:unusedmethods
Change-Id: Ie90e53583484ee4f378ec92634adf3be7cd9ecbb
Reviewed-on: https://gerrit.libreoffice.org/70650
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 9a4add2..3d3dc35 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -479,28 +479,11 @@ void TableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConne
m_xTreeView->make_sorted();
}
bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* _pEntry)
{
if (_pEntry)
{
OBoldListboxString* pTextItem = static_cast<OBoldListboxString*>(_pEntry->GetFirstItem(SvLBoxItemType::String));
if (pTextItem)
return pTextItem->isEmphasized();
}
return false;
}
bool TableTreeListBox::isWildcardChecked(weld::TreeIter& rEntry)
{
return m_xTreeView->get_text_emphasis(rEntry, m_nTextColumn);
}
void OTableTreeListBox::checkWildcard(SvTreeListEntry* _pEntry)
{
SetCheckButtonState(_pEntry, SvButtonState::Checked);
checkedButton_noBroadcast(_pEntry);
}
void TableTreeListBox::checkWildcard(weld::TreeIter& rEntry)
{
if (!m_bShowToggles)
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index 0711870..cc9b09c 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -46,9 +46,6 @@ public:
virtual void CheckButtonHdl() override;
void CheckButtons(); // make the button states consistent (bottom-up)
/// the handler given is called whenever the check state of one or more items changed
void SetCheckHandler(const Link<void*,void>& _rHdl) { m_aCheckButtonHandler = _rHdl; }
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect) override;
virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry);
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 27eedbd..8afc1ad 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -48,13 +48,9 @@ class OTableTreeListBox final : public OMarkableTreeListBox
public:
OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle);
void init() { m_bVirtualRoot = true; }
typedef std::pair< OUString, bool > TTableViewName;
typedef std::vector< TTableViewName > TNames;
void suppressEmptyFolders() { m_bNoEmptyFolders = true; }
/** call when HiContrast change.
*/
void notifyHiContrastChanged();
@@ -109,18 +105,6 @@ public:
SvTreeListEntry* getAllObjectsEntry() const;
/** does a wildcard check of the given entry
<p>There are two different 'checked' states: If the user checks all children of an entry, this is different
from checking the entry itself. The second is called 'wildcard' checking, 'cause in the resulting
table filter it's represented by a wildcard.</p>
*/
void checkWildcard(SvTreeListEntry* _pEntry);
/** determine if the given entry is 'wildcard checked'
@see checkWildcard
*/
static bool isWildcardChecked(SvTreeListEntry* pEntry);
private:
virtual void InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) override;
@@ -184,10 +168,6 @@ public:
void SuppressEmptyFolders() { m_bNoEmptyFolders = true; }
void DisableCheckButtons();
/** determines whether the given entry denotes a tables folder
*/
static bool isFolderEntry( const SvTreeListEntry* _pEntry );
/** fill the table list with the tables belonging to the connection described by the parameters
@param _rxConnection
the connection, which must support the service com.sun.star.sdb.Connection
@@ -211,27 +191,6 @@ public:
const css::uno::Sequence< OUString>& _rViews
);
/** returns a NamedDatabaseObject record which describes the given entry
*/
css::sdb::application::NamedDatabaseObject
describeObject( SvTreeListEntry* _pEntry );
/** to be used if a foreign instance added a table
*/
SvTreeListEntry* addedTable( const OUString& _rName );
/** to be used if a foreign instance removed a table
*/
void removedTable( const OUString& _rName );
/** returns the fully qualified name of a table entry
@param _pEntry
the entry whose name is to be obtained. Must not denote a folder entry.
*/
OUString getQualifiedTableName( SvTreeListEntry* _pEntry ) const;
SvTreeListEntry* getEntryByQualifiedName( const OUString& _rName );
std::unique_ptr<weld::TreeIter> getAllObjectsEntry() const;
/** does a wildcard check of the given entry
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 6706010..d04cbb4 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -43,7 +43,6 @@ class Timer;
class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
{
OUString aExtraData;
const SfxItemSet* pInputSet;
std::unique_ptr<SfxItemSet> pOutputSet;
private:
@@ -58,16 +57,10 @@ protected:
SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription);
OUString& GetExtraData() { return aExtraData; }
void CreateOutputItemSet( const SfxItemSet& rInput );
void SetInputSet( const SfxItemSet* pInSet ) { pInputSet = pInSet; }
SfxItemSet* GetOutputSetImpl() { return pOutputSet.get(); }
public:
virtual ~SfxModalDialog() override;
virtual void dispose() override;
const SfxItemSet* GetOutputItemSet() const { return pOutputSet.get(); }
const SfxItemSet* GetInputItemSet() const { return pInputSet; }
};
// class SfxModelessDialog --------------------------------------------------
@@ -195,13 +188,6 @@ public:
// class SfxNoLayoutSingleTabDialog --------------------------------------------------
struct SingleTabDlgImpl
{
VclPtr<SfxTabPage> m_pSfxPage;
SingleTabDlgImpl();
};
typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which values
class SFX2_DLLPUBLIC SfxOkDialogController : public SfxDialogController
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 7527fa5..d4eb1fb 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -127,16 +127,10 @@ public:
CreateTabPage pCreateFunc, // != 0
sal_uInt16 nPos = TAB_APPEND);
void RemoveTabPage( sal_uInt16 nId );
void SetCurPageId(sal_uInt16 nId)
{
m_nAppPageId = nId;
}
void SetCurPageId(const OString& rName)
{
m_nAppPageId = m_pTabCtrl->GetPageId(rName);
}
sal_uInt16 GetCurPageId() const
{
return m_pTabCtrl->GetCurPageId();
@@ -158,7 +152,6 @@ public:
// may provide local slots converted by Map
const sal_uInt16* GetInputRanges( const SfxItemPool& );
void SetInputSet( const SfxItemSet* pInSet );
const SfxItemSet* GetOutputItemSet() const { return m_pOutSet.get(); }
short Execute() override;
diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 7b5fb5e..3e1c4ee 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -492,7 +492,6 @@ public:
void CopyINetBookmark( const INetBookmark& rBkmk );
void CopyString( const OUString& rStr );
void CopyString( SotClipboardFormatId nFmt, const OUString& rStr );
void CopyAny( SotClipboardFormatId nFmt, const css::uno::Any& rAny );
void CopyByteString( SotClipboardFormatId nFormatId, const OString& rStr );
void CopyAnyData( SotClipboardFormatId nFormatId, const sal_Char* pData, sal_uLong nLen );
diff --git a/jvmfwk/inc/fwkbase.hxx b/jvmfwk/inc/fwkbase.hxx
index 8fe077b7..8d9ae93 100644
--- a/jvmfwk/inc/fwkbase.hxx
+++ b/jvmfwk/inc/fwkbase.hxx
@@ -40,8 +40,6 @@ public:
VendorSettings();
boost::optional<VersionInfo> getVersionInformation(const OUString & sVendor) const;
::std::vector< OUString> getSupportedVendors() const;
};
/* The class offers functions to retrieve verified bootstrap parameters.
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 73d7925..1ea13e8 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -210,32 +210,6 @@ boost::optional<VersionInfo> VendorSettings::getVersionInformation(const OUStrin
return aVersionInfo;
}
std::vector<OUString> VendorSettings::getSupportedVendors() const
{
std::vector<OUString> vecVendors;
//get the nodeset for the vendor elements
jfw::CXPathObjectPtr result;
result = xmlXPathEvalExpression(
reinterpret_cast<xmlChar const *>("/jf:javaSelection/jf:vendorInfos/jf:vendor"),
m_xmlPathContextVendorSettings);
if (!xmlXPathNodeSetIsEmpty(result->nodesetval))
{
//get the values of the vendor elements + name attribute
xmlNode* cur = result->nodesetval->nodeTab[0];
while (cur != nullptr)
{
//between vendor elements are also text elements
if (cur->type == XML_ELEMENT_NODE)
{
jfw::CXmlCharPtr sAttrVendor(xmlGetProp(cur, reinterpret_cast<xmlChar const *>("name")));
vecVendors.push_back(sAttrVendor);
}
cur = cur->next;
}
}
return vecVendors;
}
::std::vector<OString> BootParams::getVMParameters()
{
::std::vector<OString> vecParams;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7d05066..bd6db82 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2200,7 +2200,6 @@ public:
void Broadcast( const ScHint& rHint );
void BroadcastCells( const ScRange& rRange, SfxHintId nHint, bool bBroadcastSingleBroadcasters = true );
void BroadcastRefMoved( const sc::RefMovedHint& rHint );
/// only area, no cell broadcast
void AreaBroadcast( const ScHint& rHint );
@@ -2218,8 +2217,6 @@ public:
void EndListeningCell( sc::EndListeningContext& rCxt, const ScAddress& rPos, SvtListener& rListener );
void EndListeningFormulaCells( std::vector<ScFormulaCell*>& rCells );
void CollectAllAreaListeners(
std::vector<SvtListener*>& rListeners, const ScRange& rRange, sc::AreaOverlapType eType );
void PutInFormulaTree( ScFormulaCell* pCell );
void RemoveFromFormulaTree( ScFormulaCell* pCell );
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index 44e63fb..ef5fc60 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -22,7 +22,6 @@ class RefHint : public SfxHint
{
public:
enum Type {
Moved,
ColumnReordered,
RowReordered,
StartListening,
@@ -47,30 +46,6 @@ public:
Type getType() const;
};
class RefMovedHint : public RefHint
{
ScRange const maRange;
ScAddress const maMoveDelta;
const sc::RefUpdateContext& mrCxt;
public:
RefMovedHint( const ScRange& rRange, const ScAddress& rMove, const sc::RefUpdateContext& rCxt );
virtual ~RefMovedHint() override;
/**
* Get the source range from which the references have moved.
*/
const ScRange& getRange() const;
/**
* Get the movement vector.
*/
const ScAddress& getDelta() const;
const sc::RefUpdateContext& getContext() const;
};
class RefColReorderHint : public RefHint
{
const sc::ColRowReorderMapType& mrColMap;
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 6fedfec..98e5321 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -187,95 +187,6 @@ void ScDocument::BroadcastCells( const ScRange& rRange, SfxHintId nHint, bool bB
BroadcastUno(SfxHint(SfxHintId::ScDataChanged));
}
namespace {
class RefMovedNotifier
{
const sc::RefMovedHint& mrHint;
public:
explicit RefMovedNotifier( const sc::RefMovedHint& rHint ) : mrHint(rHint) {}
void operator() ( SvtListener* p )
{
p->Notify(mrHint);
}
};
}
void ScDocument::BroadcastRefMoved( const sc::RefMovedHint& rHint )
{
if (!pBASM)
// clipboard or undo document.
return;
const ScRange& rSrcRange = rHint.getRange(); // old range
const ScAddress& rDelta = rHint.getDelta();
// Get all area listeners that listens on the old range, and end their listening.
std::vector<sc::AreaListener> aAreaListeners = pBASM->GetAllListeners(rSrcRange, sc::AreaInside);
{
for (auto& rAreaListener : aAreaListeners)
{
pBASM->EndListeningArea(rAreaListener.maArea, rAreaListener.mbGroupListening, rAreaListener.mpListener);
rAreaListener.mpListener->Notify(rHint); // Adjust the references.
}
}
// Collect all listeners listening into the range.
std::vector<SvtListener*> aListeners;
for (SCTAB nTab = rSrcRange.aStart.Tab(); nTab <= rSrcRange.aEnd.Tab(); ++nTab)
{
ScTable* pTab = FetchTable(nTab);
if (!pTab)
continue;
pTab->CollectListeners(
aListeners,
rSrcRange.aStart.Col(), rSrcRange.aStart.Row(),
rSrcRange.aEnd.Col(), rSrcRange.aEnd.Row());
}
// Remove any duplicate listener entries. We must ensure that we notify
// each unique listener only once.
std::sort(aListeners.begin(), aListeners.end());
aListeners.erase(std::unique(aListeners.begin(), aListeners.end()), aListeners.end());
// Notify the listeners.
std::for_each(aListeners.begin(), aListeners.end(), RefMovedNotifier(rHint));
for (SCTAB nTab = rSrcRange.aStart.Tab(); nTab <= rSrcRange.aEnd.Tab(); ++nTab)
{
ScTable* pTab = FetchTable(nTab);
if (!pTab)
continue;
SCTAB nDestTab = nTab + rDelta.Tab();
ScTable* pDestTab = FetchTable(nDestTab);
if (!pDestTab)
continue;
// Move the listeners from the old location to the new.
pTab->TransferListeners(
*pDestTab, rSrcRange.aStart.Col(), rSrcRange.aStart.Row(),
rSrcRange.aEnd.Col(), rSrcRange.aEnd.Row(), rDelta.Col(), rDelta.Row());
}
// Re-start area listeners on the new range.
{
ScRange aErrorRange( ScAddress::UNINITIALIZED );
for (auto& rAreaListener : aAreaListeners)
{
ScRange aNewRange = rAreaListener.maArea;
if (!aNewRange.Move(rDelta.Col(), rDelta.Row(), rDelta.Tab(), aErrorRange))
{
assert(!"can't move AreaListener");
}
pBASM->StartListeningArea(aNewRange, rAreaListener.mbGroupListening, rAreaListener.mpListener);
}
}
}
void ScDocument::AreaBroadcast( const ScHint& rHint )
{
if ( !pBASM )
diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index 1b808d1..c286ecb 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -397,17 +397,6 @@ void ScDocument::AddDelayedFormulaGroupingCell( const ScFormulaCell* cell )
pDelayedFormulaGrouping->ExtendTo( cell->aPos );
}
void ScDocument::CollectAllAreaListeners(
std::vector<SvtListener*>& rListener, const ScRange& rRange, sc::AreaOverlapType eType )
{
if (!pBASM)
return;
std::vector<sc::AreaListener> aAL = pBASM->GetAllListeners(rRange, eType);
for (const auto& rItem : aAL)
rListener.push_back(rItem.mpListener);
}
bool ScDocument::HasFormulaCell( const ScRange& rRange ) const
{
if (!rRange.IsValid())
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 9edddf0..4b2a06f 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2363,24 +2363,6 @@ void ScFormulaCell::Notify( const SfxHint& rHint )
switch (rRefHint.getType())
{
case sc::RefHint::Moved:
{
// One of the references has moved.
const sc::RefMovedHint& rRefMoved = static_cast<const sc::RefMovedHint&>(rRefHint);
if (!IsShared() || IsSharedTop())
{
sc::RefUpdateResult aRes = pCode->MoveReference(aPos, rRefMoved.getContext());
if (aRes.mbNameModified)
{
// RPN token needs to be re-generated.
bCompile = true;
CompileTokenArray();
SetDirtyVar();
}
}
}
break;
case sc::RefHint::ColumnReordered:
{
const sc::RefColReorderHint& rRefColReorder =
diff --git a/sc/source/core/tool/refhint.cxx b/sc/source/core/tool/refhint.cxx
index b453a42..a7245fd 100644
--- a/sc/source/core/tool/refhint.cxx
+++ b/sc/source/core/tool/refhint.cxx
@@ -19,26 +19,6 @@ RefHint::Type RefHint::getType() const
return meType;
}
RefMovedHint::RefMovedHint( const ScRange& rRange, const ScAddress& rMove, const sc::RefUpdateContext& rCxt ) :
RefHint(Moved), maRange(rRange), maMoveDelta(rMove), mrCxt(rCxt) {}
RefMovedHint::~RefMovedHint() {}
const ScRange& RefMovedHint::getRange() const
{
return maRange;
}
const ScAddress& RefMovedHint::getDelta() const
{
return maMoveDelta;
}
const sc::RefUpdateContext& RefMovedHint::getContext() const
{
return mrCxt;
}
RefColReorderHint::RefColReorderHint( const sc::ColRowReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 ) :
RefHint(ColumnReordered), mrColMap(rColMap), mnTab(nTab), mnRow1(nRow1), mnRow2(nRow2) {}
diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx
index aab677f..7d46b7e 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -29,64 +29,6 @@ struct ScRangeNameLine
OUString aScope;
};
//Implements the table for the manage names dialog
//TODO: cache the lines for performance improvements
//otherwise handling of a large set of range names might get extremely slow
//Need some sort of a filter to handle several range names
class SC_DLLPUBLIC ScRangeManagerTable : public SvSimpleTable
{
public:
class InitListener
{
public:
virtual ~InitListener();
virtual void tableInitialized() = 0;
};
private:
OUString const maGlobalString;
// should be const because we should not modify it here
const std::map<OUString, std::unique_ptr<ScRangeName>>& m_RangeMap;
// for performance, save which entries already have the formula entry
// otherwise opening the dialog with a lot of range names is extremely slow because
// we would calculate all formula strings during opening
std::map<SvTreeListEntry*, bool> maCalculatedFormulaEntries;
const ScAddress maPos;
InitListener* mpInitListener;
static void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry);
void Init();
void CheckForFormulaString();
const ScRangeData* findRangeData(const ScRangeNameLine& rLine);
void setColWidths();
public:
ScRangeManagerTable(SvSimpleTableContainer& rParent,
const std::map<OUString, std::unique_ptr<ScRangeName>>& rTabRangeNames,
const ScAddress& rPos);
virtual ~ScRangeManagerTable() override;
virtual void dispose() override;
virtual void Resize() override;
virtual void StateChanged( StateChangedType nStateChange ) override;
void setInitListener( InitListener* pListener );
void addEntry( const ScRangeNameLine& rLine, bool bSetCurEntry );
void DeleteSelectedEntries();
void SetEntry( const ScRangeNameLine& rLine );
void GetCurrentLine(ScRangeNameLine& rLine);
bool IsMultiSelection();
std::vector<ScRangeNameLine> GetSelectedEntries();
DECL_LINK( ScrollHdl, SvTreeListBox*, void);
DECL_LINK( HeaderEndDragHdl, HeaderBar*, void);
};
class SC_DLLPUBLIC RangeManagerTable
{
private:
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 790840e..87deb5f 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -69,7 +69,6 @@ public:
void SetObjectSelectHdl( const Link<ScEditWindow&,void>& aLink) { aObjectSelectLink = aLink; }
void SetGetFocusHdl(const std::function<void (ScEditWindow&)>& rLink) { m_GetFocusLink = rLink; }
void SetLocation(ScEditWindowLocation eLoc) { eLocation = eLoc; }
protected:
virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
virtual bool MouseMove( const MouseEvent& rMEvt ) override;
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 22bde43..35311d8 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -22,118 +22,6 @@
#include <vcl/layout.hxx>
#include <tools/link.hxx>
#define ITEMID_NAME 1
#define ITEMID_RANGE 2
#define ITEMID_SCOPE 3
#define MINSIZE 80
static OUString createEntryString(const ScRangeNameLine& rLine)
{
OUString aRet = rLine.aName + "\t" + rLine.aExpression + "\t" + rLine.aScope;
return aRet;
}
ScRangeManagerTable::InitListener::~InitListener() {}
ScRangeManagerTable::ScRangeManagerTable(SvSimpleTableContainer& rParent,
const std::map<OUString, std::unique_ptr<ScRangeName>>& rRangeMap,
const ScAddress& rPos)
: SvSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
, maGlobalString( ScResId(STR_GLOBAL_SCOPE))
, m_RangeMap(rRangeMap)
, maPos( rPos )
, mpInitListener(nullptr)
{
static long aStaticTabs[] = { 0, 0, 0 };
SetTabs( SAL_N_ELEMENTS(aStaticTabs), aStaticTabs, MapUnit::MapPixel );
OUString aNameStr(ScResId(STR_HEADER_NAME));
OUString aRangeStr(ScResId(STR_HEADER_RANGE_OR_EXPR));
OUString aScopeStr(ScResId(STR_HEADER_SCOPE));
HeaderBar& rHeaderBar = GetTheHeaderBar();
InsertHeaderEntry( aNameStr );
InsertHeaderEntry( aRangeStr );
InsertHeaderEntry( aScopeStr );
rHeaderBar.SetEndDragHdl( LINK( this, ScRangeManagerTable, HeaderEndDragHdl ) );
setColWidths();
UpdateViewSize();
Init();
ShowTable();
SetSelectionMode(SelectionMode::Multiple);
SetScrolledHdl( LINK( this, ScRangeManagerTable, ScrollHdl ) );
HeaderEndDragHdl(nullptr);
}
void ScRangeManagerTable::Resize()
{
SvSimpleTable::Resize();
if (isInitialLayout(this))
setColWidths();
}
void ScRangeManagerTable::StateChanged( StateChangedType nStateChange )
{
SvSimpleTable::StateChanged(nStateChange);
if (nStateChange == StateChangedType::InitShow)
{
if (GetEntryCount())
{
SetCurEntry(GetEntryOnPos(0));
CheckForFormulaString();
}
if (mpInitListener)
mpInitListener->tableInitialized();
}
}
void ScRangeManagerTable::setColWidths()
{
HeaderBar &rHeaderBar = GetTheHeaderBar();
if (rHeaderBar.GetItemCount() < 3)
return;
long nTabSize = GetSizePixel().Width() / 3;
rHeaderBar.SetItemSize( ITEMID_NAME, nTabSize);
rHeaderBar.SetItemSize( ITEMID_RANGE, nTabSize);
rHeaderBar.SetItemSize( ITEMID_SCOPE, nTabSize);
static long aStaticTabs[] = {0, nTabSize, 2*nTabSize };
SetTabs( SAL_N_ELEMENTS(aStaticTabs), aStaticTabs, MapUnit::MapPixel );
HeaderEndDragHdl(nullptr);
}
ScRangeManagerTable::~ScRangeManagerTable()
{
disposeOnce();
}
void ScRangeManagerTable::dispose()
{
Clear();
SvSimpleTable::dispose();
}
void ScRangeManagerTable::setInitListener( InitListener* pListener )
{
mpInitListener = pListener;
}
void ScRangeManagerTable::addEntry(const ScRangeNameLine& rLine, bool bSetCurEntry)
{
SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(rLine));
if (bSetCurEntry)
SetCurEntry(pEntry);
}
void ScRangeManagerTable::GetCurrentLine(ScRangeNameLine& rLine)
{
SvTreeListEntry* pCurrentEntry = GetCurEntry();
GetLine(rLine, pCurrentEntry);
}
void RangeManagerTable::GetCurrentLine(ScRangeNameLine& rLine)
{
std::unique_ptr<weld::TreeIter> xCurrentEntry(m_xTreeView->make_iterator());
@@ -141,72 +29,6 @@ void RangeManagerTable::GetCurrentLine(ScRangeNameLine& rLine)
GetLine(rLine, *xCurrentEntry);
}
void ScRangeManagerTable::GetLine(ScRangeNameLine& rLine, SvTreeListEntry* pEntry)
{
rLine.aName = GetEntryText( pEntry, 0);
rLine.aExpression = GetEntryText(pEntry, 1);
rLine.aScope = GetEntryText(pEntry, 2);
}
void ScRangeManagerTable::Init()
{
SetUpdateMode(false);
Clear();
for (auto const& itr : m_RangeMap)
{
const ScRangeName *const pLocalRangeName = itr.second.get();
ScRangeNameLine aLine;
if (itr.first == STR_GLOBAL_RANGE_NAME)
aLine.aScope = maGlobalString;
else
aLine.aScope = itr.first;
for (const auto& rEntry : *pLocalRangeName)
{
if (!rEntry.second->HasType(ScRangeData::Type::Database))
{
aLine.aName = rEntry.second->GetName();
addEntry(aLine, false);
}
}
}
SetUpdateMode(true);
}
const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLine)
{
const ScRangeName* pRangeName;
if (rLine.aScope == maGlobalString)
pRangeName = m_RangeMap.find(OUString(STR_GLOBAL_RANGE_NAME))->second.get();
else
pRangeName = m_RangeMap.find(rLine.aScope)->second.get();
return pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(rLine.aName));
}
void ScRangeManagerTable::CheckForFormulaString()
{
for (SvTreeListEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry = GetNextEntryInView(pEntry))
{
std::map<SvTreeListEntry*, bool>::const_iterator itr = maCalculatedFormulaEntries.find(pEntry);
if (itr == maCalculatedFormulaEntries.end() || !itr->second)
{
ScRangeNameLine aLine;
GetLine( aLine, pEntry);
const ScRangeData* pData = findRangeData( aLine );
OUString aFormulaString;
pData->GetSymbol(aFormulaString, maPos);
SetEntryText(aFormulaString, pEntry, 1);
maCalculatedFormulaEntries.insert( std::pair<SvTreeListEntry*, bool>(pEntry, true) );
}
}
}
void ScRangeManagerTable::DeleteSelectedEntries()
{
if (GetSelectionCount())
RemoveSelection();
}
void RangeManagerTable::DeleteSelectedEntries()
{
std::vector<int> aRows = m_xTreeView->get_selected_rows();
@@ -215,47 +37,11 @@ void RangeManagerTable::DeleteSelectedEntries()
m_xTreeView->remove(*it);
}
bool ScRangeManagerTable::IsMultiSelection()
{
return GetSelectionCount() > 1;
}
bool RangeManagerTable::IsMultiSelection()
{
return m_xTreeView->count_selected_rows() > 1;
}
std::vector<ScRangeNameLine> ScRangeManagerTable::GetSelectedEntries()
{
std::vector<ScRangeNameLine> aSelectedEntries;
if (GetSelectionCount())
{
for (SvTreeListEntry* pEntry = FirstSelected(); pEntry != LastSelected(); pEntry = NextSelected(pEntry))
{
ScRangeNameLine aLine;
GetLine( aLine, pEntry );
aSelectedEntries.push_back(aLine);
}
SvTreeListEntry* pEntry = LastSelected();
ScRangeNameLine aLine;
GetLine( aLine, pEntry );
aSelectedEntries.push_back(aLine);
}
return aSelectedEntries;
}
void ScRangeManagerTable::SetEntry(const ScRangeNameLine& rLine)
{
for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
{
if (rLine.aName == GetEntryText(pEntry, 0)
&& rLine.aScope == GetEntryText(pEntry, 2))
{
SetCurEntry(pEntry);
}
}
}
void RangeManagerTable::SetEntry(const ScRangeNameLine& rLine)
{
for (int i = 0, nEntryCount = m_xTreeView->n_children(); i < nEntryCount; ++i)
@@ -268,76 +54,6 @@ void RangeManagerTable::SetEntry(const ScRangeNameLine& rLine)
}
}
namespace {
//ensure that the minimum column size is respected
void CalculateItemSize(long rTableSize, long& rItemNameSize, long& rItemRangeSize)
{
long aItemScopeSize = rTableSize - rItemNameSize - rItemRangeSize;
if (rItemNameSize >= MINSIZE && rItemRangeSize >= MINSIZE && aItemScopeSize >= MINSIZE)
return;
if (rItemNameSize < MINSIZE)
{
long aDiffSize = MINSIZE - rItemNameSize;
if (rItemRangeSize > aItemScopeSize)
rItemRangeSize -= aDiffSize;
else
aItemScopeSize -= aDiffSize;
rItemNameSize = MINSIZE;
}
if (rItemRangeSize < MINSIZE)
{
long aDiffSize = MINSIZE - rItemRangeSize;
if (rItemNameSize > aItemScopeSize)
rItemNameSize -= aDiffSize;
else
aItemScopeSize -= aDiffSize;
rItemRangeSize = MINSIZE;
}
if (aItemScopeSize < MINSIZE)
{
long aDiffSize = MINSIZE - aItemScopeSize;
if (rItemNameSize > rItemRangeSize)
rItemNameSize -= aDiffSize;
else
rItemRangeSize -= aDiffSize;
}
}
}
IMPL_LINK_NOARG(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void)
{
HeaderBar& rHeaderBar = GetTheHeaderBar();
long nTableSize = rHeaderBar.GetSizePixel().Width();
long nItemNameSize = rHeaderBar.GetItemSize(ITEMID_NAME);
long nItemRangeSize = rHeaderBar.GetItemSize(ITEMID_RANGE);
//calculate column size based on user input and minimum size
CalculateItemSize(nTableSize, nItemNameSize, nItemRangeSize);
long nItemScopeSize = nTableSize - nItemNameSize - nItemRangeSize;
Size aSz(nItemNameSize, 0);
rHeaderBar.SetItemSize(ITEMID_NAME, nItemNameSize);
rHeaderBar.SetItemSize(ITEMID_RANGE, nItemRangeSize);
rHeaderBar.SetItemSize(ITEMID_SCOPE, nItemScopeSize);
SetTab(0, 0);
SetTab(1, PixelToLogic( aSz, MapMode(MapUnit::MapAppFont) ).Width() );
aSz.AdjustWidth(nItemRangeSize );
SetTab(2, PixelToLogic( aSz, MapMode(MapUnit::MapAppFont) ).Width() );
}
IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl, SvTreeListBox*, void)
{
CheckForFormulaString();
}
RangeManagerTable::RangeManagerTable(std::unique_ptr<weld::TreeView> xTreeView,
const std::map<OUString, std::unique_ptr<ScRangeName>>& rRangeMap,
const ScAddress& rPos)
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index c516053..9e34ada 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -128,23 +128,6 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,
mnCurvePathPos( LISTBOX_ENTRY_NOTFOUND ),
mnPolygonPathPos( LISTBOX_ENTRY_NOTFOUND ),
mnFreeformPathPos( LISTBOX_ENTRY_NOTFOUND ),
mbHorizontal( false ),
maLateInitTimer()
{
initialize();
}
CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
bool )
: PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanelhorizontal.ui", rxFrame ),
mrBase( rBase ),
mpCustomAnimationPresets(nullptr),
mnPropertyType( nPropertyTypeNone ),
mnCurvePathPos( LISTBOX_ENTRY_NOTFOUND ),
mnPolygonPathPos( LISTBOX_ENTRY_NOTFOUND ),
mnFreeformPathPos( LISTBOX_ENTRY_NOTFOUND ),
mbHorizontal( true ),
maLateInitTimer()
{
initialize();
@@ -156,8 +139,7 @@ void CustomAnimationPane::initialize()
get(mpPBAddEffect, "add_effect");
get(mpPBRemoveEffect, "remove_effect");
if(!mbHorizontal)
get(mpFTEffect, "effect_label");
get(mpFTEffect, "effect_label");
get(mpFTStart, "start_effect");
get(mpLBStart, "start_effect_list");
@@ -214,8 +196,7 @@ void CustomAnimationPane::initialize()
mpMFStartDelay->SetLoseFocusHdl(LINK( this, CustomAnimationPane, DelayLoseFocusHdl));
if(!mbHorizontal)
maStrModify = mpFTEffect->GetText();
maStrModify = mpFTEffect->GetText();
// get current controller and initialize listeners
try
@@ -257,8 +238,7 @@ void CustomAnimationPane::dispose()
mpPBAddEffect.clear();
mpPBRemoveEffect.clear();
if(!mbHorizontal)
mpFTEffect.clear();
mpFTEffect.clear();
mpFTStart.clear();
mpLBStart.clear();
mpFTProperty.clear();
@@ -555,7 +535,7 @@ void CustomAnimationPane::updateControls()
OUString aTemp( maStrModify );
if( !mbHorizontal && !aUIName.isEmpty() )
if( !aUIName.isEmpty() )
{
aTemp += " " + aUIName;
mpFTEffect->SetText( aTemp );
@@ -688,8 +668,7 @@ void CustomAnimationPane::updateControls()
mpFTDuration->Enable(false);
mpCBXDuration->Enable(false);
mpCBXDuration->SetNoSelection();
if(!mbHorizontal)
mpFTEffect->SetText( maStrModify );
mpFTEffect->SetText( maStrModify );
}
bool bEnableUp = true;
@@ -885,9 +864,6 @@ void CustomAnimationPane::DataChanged (const DataChangedEvent&)
void CustomAnimationPane::UpdateLook()
{
if( mbHorizontal )
return;
Wallpaper aBackground (
::sfx2::sidebar::Theme::GetWallpaper(
::sfx2::sidebar::Theme::Paint_PanelBackground));
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index ce2211e..8df9d25 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -60,7 +60,6 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr
friend class MotionPathTag;
public:
CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame );
CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, bool bHorizontal );
virtual ~CustomAnimationPane() override;
virtual void dispose() override;
@@ -166,8 +165,6 @@ private:
sal_Int32 mnPolygonPathPos;
sal_Int32 mnFreeformPathPos;
bool const mbHorizontal;
EffectSequence maListSelection;
css::uno::Any maViewSelection;
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 5faa59f..cdc8685 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -105,12 +105,6 @@ public:
, aImpl(this, rBase)
{
}
TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase, bool )
: PanelLayout(pParent, "TableDesignPanel",
"modules/simpress/ui/tabledesignpanelhorizontal.ui", css::uno::Reference<css::frame::XFrame>())
, aImpl(this, rBase)
{
}
};
}
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 405b874..fcab3b5 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -596,44 +596,6 @@ const uno::Sequence< sal_Int8 >& SfxThumbnailViewAcc::getUnoTunnelId()
return theSfxValueSetAccUnoTunnelId::get().getSeq();
}
SfxThumbnailViewAcc* SfxThumbnailViewAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData )
throw()
{
try
{
uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY );
return( xUnoTunnel.is() ? reinterpret_cast<SfxThumbnailViewAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething( SfxThumbnailViewAcc::getUnoTunnelId() ))) : nullptr );
}
catch(const css::uno::Exception&)
{
return nullptr;
}
}
void SfxThumbnailViewAcc::GetFocus()
{
mbIsFocused = true;
// Broadcast the state change.
css::uno::Any aOldState, aNewState;
aNewState <<= css::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
css::accessibility::AccessibleEventId::STATE_CHANGED,
aOldState, aNewState);
}
void SfxThumbnailViewAcc::LoseFocus()
{
mbIsFocused = false;
// Broadcast the state change.
css::uno::Any aOldState, aNewState;
aOldState <<= css::accessibility::AccessibleStateType::FOCUSED;
FireAccessibleEvent(
css::accessibility::AccessibleEventId::STATE_CHANGED,
aOldState, aNewState);
}
uno::Reference< accessibility::XAccessibleContext > SAL_CALL SfxThumbnailViewAcc::getAccessibleContext()
{
ThrowIfDisposed();
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 0cc5122..d47f94c 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -172,22 +172,8 @@ public:
const css::uno::Any& rOldValue,
const css::uno::Any& rNewValue );
bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
static SfxThumbnailViewAcc* getImplementation( const css::uno::Reference< css::uno::XInterface >& rxData ) throw();
public:
/** Called by the corresponding ValueSet when it gets the focus.
Stores the new focus state and broadcasts a state change event.
*/
void GetFocus();
/** Called by the corresponding ValueSet when it loses the focus.
Stores the new focus state and broadcasts a state change event.
*/
void LoseFocus();
// XAccessible
virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override;
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index f6f3e1b..230b165 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -44,11 +44,6 @@ using namespace ::com::sun::star::uno;
#define USERITEM_NAME "UserItem"
SingleTabDlgImpl::SingleTabDlgImpl()
: m_pSfxPage(nullptr)
{
}
class SfxModelessDialog_Impl : public SfxListener
{
public:
@@ -122,8 +117,7 @@ void SfxModalDialog::GetDialogData_Impl()
}
SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription )
: ModalDialog(pParent, rID, rUIXMLDescription),
pInputSet(nullptr)
: ModalDialog(pParent, rID, rUIXMLDescription)
{
SetInstallLOKNotifierHdl(LINK(this, SfxModalDialog, InstallLOKNotifierHdl));
GetDialogData_Impl();
@@ -147,16 +141,6 @@ void SfxModalDialog::dispose()
ModalDialog::dispose();
}
void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
{
DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" );
if (!pOutputSet)
{
pOutputSet.reset(new SfxItemSet( rSet ));
pOutputSet->ClearItem();
}
}
void SfxModelessDialog::StateChanged( StateChangedType nStateChange )
{
if ( nStateChange == StateChangedType::InitShow )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d1f9426..8c918ca 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -630,51 +630,6 @@ void SfxTabDialog::AddTabPage
m_pImpl->aData.push_back( new Data_Impl(nId, "", pCreateFunc, nullptr ) );
}
void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
/* [Description]
Delete the TabPage with ID nId
*/
{
sal_uInt16 nPos = 0;
m_pTabCtrl->RemovePage( nId );
Data_Impl* pDataObject = Find( m_pImpl->aData, nId, &nPos );
if ( pDataObject )
{
if ( pDataObject->pTabPage )
{
pDataObject->pTabPage->FillUserData();
OUString aPageData( pDataObject->pTabPage->GetUserData() );
if ( !aPageData.isEmpty() )
{
// save settings of this page (user data)
OUString sConfigId = OStringToOUString(pDataObject->pTabPage->GetConfigId(),
RTL_TEXTENCODING_UTF8);
if (sConfigId.isEmpty())
{
SAL_WARN("sfx.dialog", "Tabpage needs to be converted to .ui format");
sConfigId = OUString::number(pDataObject->nId);
}
SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId);
aPageOpt.SetUserItem( USERITEM_NAME, makeAny( aPageData ) );
}
pDataObject->pTabPage.disposeAndClear();
}
delete pDataObject;
m_pImpl->aData.erase( m_pImpl->aData.begin() + nPos );
}
else
{
SAL_INFO( "sfx.dialog", "TabPage-Id not known" );
}
}
void SfxTabDialog::PageCreated
/* [Description]
@@ -1271,24 +1226,6 @@ void SfxTabDialog::SetPageName(sal_uInt16 nPageId, const OString& rName) const
m_pTabCtrl->SetPageName(nPageId, rName);
}
void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )
/* [Description]
With this method the Input-Set can subsequently be set initially or re-set.
*/
{
bool bSet = ( m_pSet != nullptr );
m_pSet.reset(pInSet ? new SfxItemSet(*pInSet) : nullptr);
if (!bSet && !m_pExampleSet && !m_pOutSet && m_pSet)
{
m_pExampleSet = new SfxItemSet( *m_pSet );
m_pOutSet.reset(new SfxItemSet( *m_pSet->GetPool(), m_pSet->GetRanges() ));
}
}
FactoryFunction SfxTabDialog::GetUITestFactory() const
{
return SfxTabDialogUIObject::create;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index c590e3a..dfc841a 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -45,12 +45,6 @@
using namespace nsSwDocInfoSubType;
using namespace com::sun::star;
void FillFieldSelect(ListBox& rListBox)
{
for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_SELECT); ++i)
rListBox.InsertEntry(SwResId(FLD_SELECT[i]));
}
void FillFieldSelect(weld::TreeView& rListBox)
{
for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_SELECT); ++i)
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index b4d7032..ed36cf5 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -63,7 +63,6 @@ public:
virtual void FillUserData() override;
};
void FillFieldSelect(ListBox& rListBox);
void FillFieldSelect(weld::TreeView& rListBox);
#endif
diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx
index 9d959d0..a731ec2 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -439,17 +439,6 @@ void TransferDataContainer::CopyString( const OUString& rStr )
}
void TransferDataContainer::CopyAny( SotClipboardFormatId nFmt,
const css::uno::Any& rAny )
{
TDataCntnrEntry_Impl aEntry;
aEntry.nId = nFmt;
aEntry.aAny = rAny;
pImpl->aFmtList.push_back( aEntry );
AddFormat( aEntry.nId );
}
bool TransferDataContainer::HasAnyData() const
{
return !pImpl->aFmtList.empty() ||
