ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:unusedmethods

Browse Source 
Change-Id: I5eec1b68efc285995db3b5825699c07fa006cb35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207375
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Xisco Fauli
2026-06-29 10:16:53 +02:00
parent bd90af59c0
commit 00aebb5e88
45 changed files with 27 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/inc/chartview/ChartSfxItemIds.hxx
-1
View File
@@ -259,7 +259,6 @@ struct AxisFlags{
static T toNum (const U&& fl){ return static_cast<T>(fl);}
bool operator==(const T& val){return val == static_cast<T>(m);}
bool operator==(const U& fl){return fl == m;}
bool operator==(const AxisFlags& other){return other==this;}
private:
U m;
};
chart2/source/view/charttypes/HistogramChart.cxx
+1 -42
View File
@@ -79,47 +79,6 @@ PlottingPositionHelper& HistogramChart::getPlottingPositionHelper(sal_Int32 nAxi
return rPosHelper;
}
css::awt::Point HistogramChart::getLabelScreenPositionAndAlignment(
LabelAlignment& rAlignment, sal_Int32 nLabelPlacement, double fScaledX,
double fScaledLowerYValue, double fScaledUpperYValue, double fBaseValue,
BarPositionHelper const* pPosHelper) const
{
double fY = fScaledUpperYValue;
bool bReverse = !pPosHelper->isMathematicalOrientationY();
bool bNormalOutside = (!bReverse == (fBaseValue < fScaledUpperYValue));
switch (nLabelPlacement)
{
case css::chart::DataLabelPlacement::TOP:
fY = bReverse ? fScaledLowerYValue : fScaledUpperYValue;
rAlignment = LABEL_ALIGN_TOP;
break;
case css::chart::DataLabelPlacement::BOTTOM:
fY = bReverse ? fScaledUpperYValue : fScaledLowerYValue;
rAlignment = LABEL_ALIGN_BOTTOM;
break;
case css::chart::DataLabelPlacement::OUTSIDE:
fY = (fBaseValue < fScaledUpperYValue) ? fScaledUpperYValue : fScaledLowerYValue;
rAlignment = bNormalOutside ? LABEL_ALIGN_TOP : LABEL_ALIGN_BOTTOM;
break;
case css::chart::DataLabelPlacement::INSIDE:
fY = (fBaseValue < fScaledUpperYValue) ? fScaledUpperYValue : fScaledLowerYValue;
rAlignment = bNormalOutside ? LABEL_ALIGN_BOTTOM : LABEL_ALIGN_TOP;
break;
case css::chart::DataLabelPlacement::CENTER:
fY -= (fScaledUpperYValue - fScaledLowerYValue) / 2.0;
rAlignment = LABEL_ALIGN_CENTER;
break;
default:
OSL_FAIL("this label alignment is not implemented yet");
break;
}
css::drawing::Position3D aScenePosition3D(
pPosHelper->transformScaledLogicToScene(fScaledX, fY, 0.0, true));
return LabelPositionHelper(2, m_xLogicTarget).transformSceneToScreenPosition(aScenePosition3D);
}
void HistogramChart::addSeries(std::unique_ptr<VDataSeries> pSeries, sal_Int32 zSlot,
sal_Int32 xSlot, sal_Int32 ySlot)
{
@@ -183,4 +142,4 @@ void HistogramChart::createShapes()
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
chart2/source/view/charttypes/HistogramChart.hxx
+1 -7
View File
@@ -32,12 +32,6 @@ public:
virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override;
private:
css::awt::Point getLabelScreenPositionAndAlignment(LabelAlignment& rAlignment,
sal_Int32 nLabelPlacement, double fScaledX,
double fScaledLowerYValue,
double fScaledUpperYValue, double fBaseValue,
BarPositionHelper const* pPosHelper) const;
virtual PlottingPositionHelper& getPlottingPositionHelper(sal_Int32 nAxisIndex) const override;
void adaptGapWidthForHistogram();
@@ -49,4 +43,4 @@ private:
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
cui/source/customize/SvxNotebookbarConfigPage.cxx
-35
View File
@@ -95,41 +95,6 @@ static OUString getModuleId(std::u16string_view sModuleName)
return u"None"_ustr;
}
SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
weld::DialogController* pController,
const SfxItemSet& rSet)
: SvxConfigPage(pPage, pController, rSet)
{
m_xCommandCategoryListBox->set_visible(false);
m_xDescriptionFieldLb->set_visible(false);
m_xSearchEdit->set_visible(false);
m_xDescriptionField->set_visible(false);
m_xMoveUpButton->set_visible(false);
m_xMoveDownButton->set_visible(false);
m_xCommandButtons->set_visible(false);
m_xLeftFunctionLabel->set_visible(false);
m_xSearchLabel->set_visible(false);
m_xCategoryLabel->set_visible(false);
m_xCustomizeBox->set_visible(false);
m_xCustomizeLabel->set_visible(false);
weld::TreeView& rCommandCategoryBox = m_xFunctions->get_widget();
rCommandCategoryBox.hide();
m_xContentsListBox.reset(
new SvxNotebookbarEntriesListBox(m_xBuilder->weld_tree_view(u"toolcontents"_ustr), this));
m_xDropTargetHelper.reset(new SvxConfigPageFunctionDropTarget(
*this, m_xContentsListBox->get_widget(), rCommandCategoryBox, Link<int, void>()));
weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
Size aSize(m_xFunctions->get_size_request());
rTreeView.set_size_request(aSize.Width(), aSize.Height());
rTreeView.set_hexpand(true);
rTreeView.set_vexpand(true);
rTreeView.set_help_id(HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS);
rTreeView.show();
}
SvxNotebookbarConfigPage::~SvxNotebookbarConfigPage() {}
void SvxNotebookbarConfigPage::DeleteSelectedTopLevel() {}
cui/source/inc/SvxNotebookbarConfigPage.hxx
-2
View File
@@ -53,8 +53,6 @@ public:
OUString sUIItemId;
OUString sClassType;
};
SvxNotebookbarConfigPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rItemSet);
virtual ~SvxNotebookbarConfigPage() override;
SaveInData* CreateSaveInData(const css::uno::Reference<css::ui::XUIConfigurationManager>&,
const css::uno::Reference<css::ui::XUIConfigurationManager>&,
include/oox/ppt/slidepersist.hxx
-1
View File
@@ -96,7 +96,6 @@ public:
bool isNotesPage() const { return mbNotes; }
void setLayoutValueToken( sal_Int32 nLayoutValueToken ) { mnLayoutValueToken = nLayoutValueToken; }
sal_Int32 getLayoutValueToken() const { return mnLayoutValueToken; }
sal_Int16 getLayoutFromValueToken() const;
include/sfx2/sidebar/Panel.hxx
-2
View File
@@ -89,7 +89,6 @@ public:
SAL_DLLPRIVATE PanelTitleBar* GetTitleBar() const;
SAL_DLLPRIVATE weld::Box* GetContents() const;
SAL_DLLPRIVATE const weld::Box* GetContainer() const { return mxContainer.get(); }
SAL_DLLPRIVATE void Show(bool bShow);
bool IsTitleBarOptional() const { return mbIsTitleBarOptional; }
SAL_DLLPRIVATE void SetUIElement(const css::uno::Reference<css::ui::XUIElement>& rxElement);
@@ -103,7 +102,6 @@ public:
bool IsExpanded() const { return mbIsExpanded; }
SAL_DLLPRIVATE bool HasIdPredicate(std::u16string_view rsId) const;
const OUString& GetId() const { return msPanelId; }
const OUString& GetTitle() const { return msTitle; }
void TriggerDeckLayouting();
SAL_DLLPRIVATE void SetHeightPixel(int nHeight);
include/svl/undo.hxx
-1
View File
@@ -67,7 +67,6 @@ public:
virtual bool Merge( SfxUndoAction *pNextAction );
virtual OUString GetComment() const;
virtual OUString GetObjDescription() const;
virtual void SetComment(const OUString& rStr);
virtual void SetObjDescription(const OUString& rStr);
include/svtools/ctrlbox.hxx
-6
View File
@@ -367,12 +367,9 @@ public:
void connect_key_press(const Link<const KeyEvent&, bool>& rLink) { m_xComboBox->connect_key_press(rLink); }
void connect_popup_toggled(const Link<weld::ComboBox&, void>& rLink){ m_xComboBox->connect_popup_toggled(rLink); }
void connect_live_preview(const Link<const FontMetric&, void>& rLink) { m_aLivePreviewHdl = rLink; }
int get_active() const { return m_xComboBox->get_active(); }
OUString get_active_text() const { return m_xComboBox->get_active_text(); }
void set_active_or_entry_text(const OUString& rText);
void set_active(int nPos) { m_xComboBox->set_active(nPos); }
int get_count() const { return m_xComboBox->get_count(); }
OUString get_text(int nIndex) const { return m_xComboBox->get_text(nIndex); }
void set_sensitive(bool bSensitive) { m_xComboBox->set_sensitive(bSensitive); }
void save_value() { m_xComboBox->save_value(); }
OUString const& get_saved_value() const { return m_xComboBox->get_saved_value(); }
@@ -498,14 +495,11 @@ public:
void set_sensitive(bool bSensitive) { m_xComboBox->set_sensitive(bSensitive); }
void set_size_request(int nWidth, int nHeight) { m_xComboBox->set_size_request(nWidth, nHeight); }
int get_active() const { return m_xComboBox->get_active(); }
int get_value() const;
void set_value(int nValue);
void save_value() { m_nSavedValue = get_value(); }
int get_saved_value() const { return m_nSavedValue; }
bool get_value_changed_from_saved() const { return get_value() != get_saved_value(); }
int get_count() const { return m_xComboBox->get_count(); }
OUString get_text(int i) const { return m_xComboBox->get_text(i); }
bool has_focus() const { return m_xComboBox->has_focus(); }
void connect_entry_activate(const Link<weld::ComboBox&, bool>& rLink) { m_xComboBox->connect_entry_activate(rLink); }
void disable_entry_completion() { m_xComboBox->set_entry_completion(false, false); }
include/svtools/valueset.hxx
-1
View File
@@ -275,7 +275,6 @@ public:
virtual void Select();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
OUString const & GetText() const { return maText; }
void SetText(const OUString& rText) { maText = rText; }
void SetStyle(WinBits nStyle);
WinBits GetStyle() const { return mnStyle; }
include/svx/ColorIconView.hxx
-5
View File
@@ -61,11 +61,6 @@ public:
m_aColorActivatedHdl = rLink;
}
void setSelectionChangedHdl(const Link<const ColorIconView&, void>& rLink)
{
m_aSelectionChangedHdl = rLink;
}
private:
ScopedVclPtr<VirtualDevice> createIcon(const Color& rColor);
};
include/svx/hlnkitem.hxx
-1
View File
@@ -107,7 +107,6 @@ public:
const OUString& GetReplacementText() const { return m_sReplacementText; }
void SetTextIsHint(bool bTextIsHint) { m_bTextIsHint = bTextIsHint; }
bool GetTextIsHint() const { return m_bTextIsHint; }
};
include/svx/svdundo.hxx
+1 -1
View File
@@ -109,7 +109,7 @@ public:
virtual void SetComment(const OUString& rStr) override;
virtual void SetObjDescription(const OUString& rStr) override;
virtual OUString GetComment() const override;
virtual OUString GetObjDescription() const override;
virtual OUString GetObjDescription() const;
virtual OUString GetSdrRepeatComment() const override;
include/vcl/BitmapTools.hxx
+2
View File
@@ -61,7 +61,9 @@ Bitmap VCL_DLLPUBLIC CreateFromData(sal_uInt8 const *pData,
sal_Int8 nBitsPerPixel,
bool bReversColors = false, bool bReverseAlpha = false);
#if defined(_WIN32) && !USE_HEADLESS_CODE
void VCL_DLLPUBLIC fillWithData(sal_uInt8* pData, Bitmap const& rBitmap);
#endif
Bitmap VCL_DLLPUBLIC CreateFromData( RawBitmap && data );
include/vcl/pdfwriter.hxx
-3
View File
@@ -877,9 +877,6 @@ public:
void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
const Bitmap& rBitmap, const Graphic& rGraphic );
void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
const Bitmap& rBitmap );
void DrawGradient( const tools::Rectangle& rRect, const Gradient& rGradient );
void DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient );
include/vcl/toolkit/treelistbox.hxx
-5
View File
@@ -445,7 +445,6 @@ public:
bool CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget );
bool MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, bool bAllowCopyFallback );
void RemoveSelection();
/**
* Removes the entry along with all of its descendants
*/
@@ -620,7 +619,6 @@ public:
void SetCheckButtonState( SvTreeListEntry*, SvButtonState );
SvButtonState GetCheckButtonState( SvTreeListEntry* ) const;
bool GetCheckButtonEnabled(SvTreeListEntry* pEntry) const;
void SetEntryText(SvTreeListEntry& rEntry, const OUString& rStr);
void SetExpandedEntryBmp(SvTreeListEntry& rEntry, const Image& _rImage);
@@ -717,10 +715,8 @@ public:
// Make single click "activate" a row like a double-click normally does
void SetActivateOnSingleClick(bool bEnable) { mbActivateOnSingleClick = bEnable; }
bool GetActivateOnSingleClick() const { return mbActivateOnSingleClick; }
void SetCustomEntryRenderer(bool bEnable) { mbCustomEntryRenderer = bEnable; }
bool GetCustomEntryRenderer() const { return mbCustomEntryRenderer; }
// Make mouse over a row "select" a row like a single-click normally does
void SetHoverSelection(bool bEnable) { mbHoverSelection = bEnable; }
@@ -728,7 +724,6 @@ public:
// to get enable or disable the text-column
void SetTextColumnEnabled(bool bEnable) { mbIsTextColumEnabled = bEnable; }
bool IsTextColumnEnabled() const { return mbIsTextColumEnabled; }
// only true during Select if the Select is due to a Hover
bool IsSelectDueToHover() const { return mbSelectingByHover; }
include/vcl/weld/DateFormatter.hxx
-1
View File
@@ -41,7 +41,6 @@ public:
private:
DECL_DLLPRIVATE_LINK(FormatOutputHdl, double, std::optional<OUString>);
DECL_DLLPRIVATE_LINK(ParseInputHdl, const OUString&, Formatter::ParseResult);
DECL_DLLPRIVATE_LINK(CursorChangedHdl, weld::Entry&, void);
SAL_DLLPRIVATE void Init();
SAL_DLLPRIVATE CalendarWrapper& GetCalendarWrapper() const;
include/vcl/window.hxx
-1
View File
@@ -746,7 +746,6 @@ public:
WindowExtendedStyle GetExtendedStyle() const;
void SetType( WindowType eType );
WindowType GetType() const;
std::string_view GetTypeName() const;
bool IsFormControl() const;
void SetFormControl(bool bFormControl);
bool IsSystemWindow() const;
sc/source/ui/dataprovider/datatransformation.cxx
-30
View File
@@ -1167,21 +1167,6 @@ TransformationType FindReplaceTransformation::getTransformationType() const
return TransformationType::FINDREPLACE_TRANSFORMATION;
}
SCCOL FindReplaceTransformation::getColumn() const
{
return mnCol;
}
const OUString& FindReplaceTransformation::getFindString() const
{
return maFindString;
}
const OUString& FindReplaceTransformation::getReplaceString() const
{
return maReplaceString;
}
DeleteRowTransformation::DeleteRowTransformation(SCCOL nCol, OUString aFindString)
: mnCol(nCol)
, maFindString(std::move(aFindString))
@@ -1215,16 +1200,6 @@ TransformationType DeleteRowTransformation::getTransformationType() const
return TransformationType::DELETEROW_TRANSFORMATION;
}
SCCOL DeleteRowTransformation::getColumn() const
{
return mnCol;
}
const OUString& DeleteRowTransformation::getFindString() const
{
return maFindString;
}
SwapRowsTransformation::SwapRowsTransformation(SCROW mRow, SCROW nRow)
: mxRow(mRow)
, nxRow(nRow)
@@ -1261,11 +1236,6 @@ TransformationType SwapRowsTransformation::getTransformationType() const
return TransformationType::SWAPROWS_TRANSFORMATION;
}
SCROW SwapRowsTransformation::getFirstRow() const
{
return mxRow;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/dataprovider/htmldataprovider.hxx
+1 -1
View File
@@ -29,7 +29,7 @@ public:
virtual void Import() override;
virtual const OUString& GetURL() const override;
virtual const OUString& GetURL() const;
void ImportFinished();
};
sc/source/ui/dataprovider/sqldataprovider.hxx
+1 -1
View File
@@ -29,7 +29,7 @@ public:
virtual void Import() override;
virtual const OUString& GetURL() const override;
virtual const OUString& GetURL() const;
void ImportFinished();
};
sc/source/ui/dataprovider/xmldataprovider.hxx
+1 -1
View File
@@ -28,7 +28,7 @@ public:
virtual void Import() override;
virtual const OUString& GetURL() const override;
virtual const OUString& GetURL() const;
void ImportFinished();
};
sc/source/ui/inc/SparklineDataRangeDialog.hxx
-1
View File
@@ -49,7 +49,6 @@ private:
void setupValues();
void perform();
bool checkValidInputOutput();
public:
SparklineDataRangeDialog(SfxBindings* pBindings, SfxChildWindow* pChildWindow,
sc/source/ui/inc/dataprovider.hxx
+1 -4
View File
@@ -56,7 +56,6 @@ public:
virtual ~CSVFetchThread() override;
void RequestTerminate();
void Terminate();
bool IsParseError() const { return mbIsParseError; }
const std::exception_ptr & GetLastException() const { return mpLastException; }
@@ -83,8 +82,6 @@ public:
virtual void Import() = 0;
virtual const OUString& GetURL() const = 0;
static std::unique_ptr<SvStream> FetchStreamFromURL(const OUString&, OStringBuffer& rBuffer);
void setDeterministic();
@@ -104,7 +101,7 @@ public:
virtual void Import() override;
const OUString& GetURL() const override;
const OUString& GetURL() const;
void ImportFinished();
};
sc/source/ui/inc/dataproviderdlg.hxx
-1
View File
@@ -62,7 +62,6 @@ private:
ScDBData* pDBData;
ScDBCollection* mpDestDBCollection;
DECL_LINK(ColumnMenuHdl, const weld::ComboBox&, void);
DECL_LINK(ScrollToEnd, Timer*, void);
DECL_LINK(ApplyQuitHdl, weld::Button&, void);
DECL_LINK(CancelQuitHdl, weld::Button&, void);
sc/source/ui/inc/datatableview.hxx
-1
View File
@@ -105,7 +105,6 @@ public:
virtual Size GetOptimalSize() const override;
void getColRange(SCCOL& rStartCol, SCCOL& rEndCol) const;
void getRowRange(SCROW& rStartRow, SCROW& rEndRow) const;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/inc/datatransformation.hxx
-6
View File
@@ -195,9 +195,6 @@ class FindReplaceTransformation : public DataTransformation
FindReplaceTransformation(SCCOL nCol, OUString aFindString, OUString aReplaceString);
virtual void Transform(ScDocument& rDoc) const override;
virtual TransformationType getTransformationType() const override;
SCCOL getColumn() const;
const OUString & getFindString() const;
const OUString & getReplaceString() const;
};
class DeleteRowTransformation : public DataTransformation
@@ -209,8 +206,6 @@ class DeleteRowTransformation : public DataTransformation
DeleteRowTransformation(SCCOL nCol, OUString aFindString);
virtual void Transform(ScDocument& rDoc) const override;
virtual TransformationType getTransformationType() const override;
SCCOL getColumn() const;
const OUString & getFindString() const;
};
class SwapRowsTransformation : public DataTransformation
@@ -221,7 +216,6 @@ class SwapRowsTransformation : public DataTransformation
SwapRowsTransformation(SCROW mRow, SCROW nRow);
virtual void Transform(ScDocument& rDoc) const override;
virtual TransformationType getTransformationType() const override;
SCROW getFirstRow() const;
};
}
sc/source/ui/miscdlgs/datatableview.cxx
-9
View File
@@ -292,15 +292,6 @@ void ScDataTableView::getColRange(SCCOL& rStartCol, SCCOL& rEndCol) const
rEndCol = static_cast<SCCOL>(aEnd);
}
void ScDataTableView::getRowRange(SCROW& rStartCol, SCROW& rEndCol) const
{
SCCOLROW aStart = 0;
SCCOLROW aEnd = 0;
mpRowView->GetMarkRange(aStart, aEnd);
rStartCol = static_cast<SCROW>(aStart);
rEndCol = static_cast<SCROW>(aEnd);
}
IMPL_LINK_NOARG(ScDataTableView, VertScrollHdl, weld::Scrollbar&, void)
{
mnFirstVisibleRow = mpVScroll->GetThumbPos();
sd/inc/unomodel.hxx
-1
View File
@@ -146,7 +146,6 @@ public:
static rtl::Reference< SdXImpressDocument > GetModel( SdDrawDocument const & rDoc );
// internal
bool operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; }
bool operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; }
::sd::DrawDocShell* GetDocShell() const { return mpDocShell; }
sfx2/inc/sidebar/PanelTitleBar.hxx
-2
View File
@@ -48,8 +48,6 @@ public:
return *mxExpander;
}
const OUString& GetMoreOptionsCommand() const { return msMoreOptionsCommand; }
private:
virtual void HandleToolBoxItemClick() override;
slideshow/source/engine/box2dtools.cxx
-10
View File
@@ -974,16 +974,6 @@ double box2DBody::getAngle() const
return ::basegfx::rad2deg(-fAngle);
}
void box2DBody::setAngle(const double fAngle)
{
#if BOX2D_CHECK_VERSION(3, 0)
b2Body_SetTransform(*mpBox2DBody, b2Body_GetPosition(*mpBox2DBody),
b2MakeRot(::basegfx::deg2rad(-fAngle)));
#else
mpBox2DBody->SetTransform(mpBox2DBody->GetPosition(), ::basegfx::deg2rad(-fAngle));
#endif
}
void box2DBody::setDensityAndRestitution(const double fDensity, const double fRestitution)
{
#if BOX2D_CHECK_VERSION(3, 0)
slideshow/source/inc/box2dtools.hxx
-7
View File
@@ -408,13 +408,6 @@ public:
/// @return current angle of rotation of the body
double getAngle() const;
/** Set angle of the box2d body
@param fAngle
Angle in degrees
*/
void setAngle(const double fAngle);
/** Set density and restitution of the box2d body
@param fDensity
starmath/inc/mathml/import.hxx
-24
View File
@@ -40,23 +40,6 @@ public:
css::uno::Reference<css::beans::XPropertySet> const& rPropSet,
const char16_t* pFilterName, bool bEncrypted,
int_fast16_t nSyntaxVersion);
/** read a component from storage
*/
ErrCode ReadThroughComponentS(const css::uno::Reference<css::embed::XStorage>& xStorage,
const css::uno::Reference<css::lang::XComponent>& xModelComponent,
const char16_t* pStreamName,
css::uno::Reference<css::uno::XComponentContext> const& rxContext,
css::uno::Reference<css::beans::XPropertySet> const& rPropSet,
const char16_t* pFilterName, int_fast16_t nSyntaxVersion);
/** read a component from text
*/
ErrCode
ReadThroughComponentMS(std::u16string_view aText,
const css::uno::Reference<css::lang::XComponent>& xModelComponent,
css::uno::Reference<css::uno::XComponentContext> const& rxContext,
css::uno::Reference<css::beans::XPropertySet> const& rPropSet);
};
class SmMLImport final : public SvXMLImport
@@ -67,20 +50,14 @@ private:
size_t m_nSmSyntaxVersion;
public:
/** Gets parsed element tree
*/
SmMlElement* getElementTree() { return m_pElementTree; }
/** Checks out if parse was a success
*/
bool getSuccess() const { return m_bSuccess; }
public:
/** Handles an error on the mathml structure
*/
void declareMlError();
public:
/** Constructor
*/
SmMLImport(const css::uno::Reference<css::uno::XComponentContext>& rContext,
@@ -90,7 +67,6 @@ public:
*/
virtual ~SmMLImport() noexcept override { cleanup(); };
public:
/** End the document
*/
void SAL_CALL endDocument() override;
starmath/source/mathml/import.cxx
-96
View File
@@ -206,102 +206,6 @@ ErrCode SmMLImportWrapper::ReadThroughComponentIS(
return ERRCODE_ABORT;
}
// read a component from storage
ErrCode SmMLImportWrapper::ReadThroughComponentS(const uno::Reference<embed::XStorage>& xStorage,
const Reference<XComponent>& xModelComponent,
const char16_t* pStreamName,
Reference<uno::XComponentContext> const& rxContext,
Reference<beans::XPropertySet> const& rPropSet,
const char16_t* pFilterName,
int_fast16_t nSyntaxVersion)
{
// Needs a storage but checked by caller
// Needs a model but checked by caller
// Needs a stream name but checked by caller
// Needs a context but checked by caller
// Needs a property set but checked by caller
// Needs a filter name but checked by caller
// Get the input stream
try
{
// Create the stream for the event read
uno::Reference<io::XStream> xEventsStream
= xStorage->openStreamElement(OUString(pStreamName), embed::ElementModes::READ);
// Determine if stream is encrypted or not
uno::Reference<beans::XPropertySet> xProps(xEventsStream, uno::UNO_QUERY);
Any aAny = xProps->getPropertyValue(u"Encrypted"_ustr);
bool bEncrypted = false;
aAny >>= bEncrypted;
// Set base URL and open stream
rPropSet->setPropertyValue(u"StreamName"_ustr, Any(OUString(pStreamName)));
Reference<io::XInputStream> xStream = xEventsStream->getInputStream();
// Execute read
return ReadThroughComponentIS(xStream, xModelComponent, rxContext, rPropSet, pFilterName,
bEncrypted, nSyntaxVersion);
}
catch (packages::WrongPasswordException&)
{
SAL_WARN("starmath", "Wrong file password");
return ERRCODE_SFX_WRONGPASSWORD;
}
catch (packages::zip::ZipIOException&)
{
SAL_WARN("starmath", "Failed to unzip file");
return ERRCODE_IO_BROKENPACKAGE;
}
catch (uno::Exception&)
{
}
return ERRCODE_SFX_DOLOADFAILED;
}
// read a component from text
ErrCode SmMLImportWrapper::ReadThroughComponentMS(
std::u16string_view aText, const css::uno::Reference<css::lang::XComponent>& xModelComponent,
css::uno::Reference<css::uno::XComponentContext> const& rxContext,
css::uno::Reference<css::beans::XPropertySet> const& rPropSet)
{
// Needs a storage but checked by caller
// Needs a model but checked by caller
// Needs a stream name but checked by caller
// Needs a context but checked by caller
// Needs a property set but checked by caller
// Needs a filter name but checked by caller
// Get the input stream
try
{
// Generate input memory stream
SvMemoryStream aMemoryStream;
aMemoryStream.WriteOString(OUStringToOString(aText, RTL_TEXTENCODING_UTF8));
uno::Reference<io::XInputStream> xStream(new utl::OInputStreamWrapper(aMemoryStream));
// Execute read
return ReadThroughComponentIS(xStream, xModelComponent, rxContext, rPropSet,
u"com.sun.star.comp.Math.MLImporter", false, 6);
}
catch (packages::WrongPasswordException&)
{
SAL_WARN("starmath", "Wrong file password");
return ERRCODE_SFX_WRONGPASSWORD;
}
catch (packages::zip::ZipIOException&)
{
SAL_WARN("starmath", "Failed to unzip file");
return ERRCODE_IO_BROKENPACKAGE;
}
catch (uno::Exception&)
{
}
return ERRCODE_SFX_DOLOADFAILED;
}
// SmMLImport technical
/*************************************************************************************************/
svgio/inc/svgstyleattributes.hxx
-3
View File
@@ -89,9 +89,6 @@ namespace svgio::svgreader
ultra_expanded
};
FontStretch getWider(FontStretch aSource);
FontStretch getNarrower(FontStretch aSource);
enum class FontStyle
{
notset,
svgio/source/svgreader/svgstyleattributes.cxx
-36
View File
@@ -85,42 +85,6 @@ namespace svgio::svgreader
}
}
FontStretch getWider(FontStretch aSource)
{
switch(aSource)
{
case FontStretch::ultra_condensed: aSource = FontStretch::extra_condensed; break;
case FontStretch::extra_condensed: aSource = FontStretch::condensed; break;
case FontStretch::condensed: aSource = FontStretch::semi_condensed; break;
case FontStretch::semi_condensed: aSource = FontStretch::normal; break;
case FontStretch::normal: aSource = FontStretch::semi_expanded; break;
case FontStretch::semi_expanded: aSource = FontStretch::expanded; break;
case FontStretch::expanded: aSource = FontStretch::extra_expanded; break;
case FontStretch::extra_expanded: aSource = FontStretch::ultra_expanded; break;
default: break;
}
return aSource;
}
FontStretch getNarrower(FontStretch aSource)
{
switch(aSource)
{
case FontStretch::extra_condensed: aSource = FontStretch::ultra_condensed; break;
case FontStretch::condensed: aSource = FontStretch::extra_condensed; break;
case FontStretch::semi_condensed: aSource = FontStretch::condensed; break;
case FontStretch::normal: aSource = FontStretch::semi_condensed; break;
case FontStretch::semi_expanded: aSource = FontStretch::normal; break;
case FontStretch::expanded: aSource = FontStretch::semi_expanded; break;
case FontStretch::extra_expanded: aSource = FontStretch::expanded; break;
case FontStretch::ultra_expanded: aSource = FontStretch::extra_expanded; break;
default: break;
}
return aSource;
}
FontWeight getBolder(FontWeight aSource)
{
switch(aSource)
svl/source/undo/undo.cxx
-7
View File
@@ -90,13 +90,6 @@ OUString SfxUndoAction::GetComment() const
return OUString();
}
OUString SfxUndoAction::GetObjDescription() const
{
return OUString();
}
void SfxUndoAction::SetComment(const OUString& /*rStr*/)
{
}
svx/inc/SvxColorValueSet.hxx
-3
View File
@@ -29,9 +29,6 @@ public:
virtual void Resize() override;
/* Maximum row/line count for the ColorValueSet control. If more lines would be needed, a scrollbar will
be used. */
static constexpr sal_uInt32 getMaxRowCount() { return 10; }
static sal_uInt32 getEntryEdgeLength();
static sal_uInt32 getColumnCount();
sw/inc/poolfmt.hxx
-2
View File
@@ -422,8 +422,6 @@ UNKNOWN = USHRT_MAX
// add some operators to make that less verbose.
inline constexpr SwPoolFormatId operator-(SwPoolFormatId lhs, SwPoolFormatId rhs)
{ return SwPoolFormatId(sal_uInt16(lhs) - sal_uInt16(rhs)); }
inline constexpr SwPoolFormatId operator&(SwPoolFormatId lhs, SwPoolFormatId rhs)
{ return SwPoolFormatId(sal_uInt16(lhs) & sal_uInt16(rhs)); }
inline constexpr SwPoolFormatId operator+(SwPoolFormatId lhs, sal_uInt16 rhs)
{ return SwPoolFormatId(sal_uInt16(lhs) + rhs); }
inline constexpr SwPoolFormatId operator-(SwPoolFormatId lhs, sal_uInt16 rhs)
sw/source/uibase/inc/pam2html.hxx
-1
View File
@@ -26,7 +26,6 @@
namespace SwPam2Html
{
SW_DLLPUBLIC OString ExportPaMToHTML(SwPaM* pCursor);
SW_DLLPUBLIC void PasteHTMLToPaM(SwWrtShell& rWrtSh, const SwPaM* pCursor, const OString& rData);
}
sw/source/uibase/shells/pam2html.cxx
+1 -33
View File
@@ -28,38 +28,6 @@
namespace SwPam2Html
{
OString ExportPaMToHTML(SwPaM* pCursor)
{
SolarMutexGuard gMutex;
OString aResult;
WriterRef xWrt;
GetHTMLWriter(u"NoLineLimit,SkipHeaderFooter,NoPrettyPrint", OUString(), xWrt);
if (pCursor != nullptr)
{
SvMemoryStream aMemoryStream;
SwWriter aWriter(aMemoryStream, *pCursor);
ErrCodeMsg nError = aWriter.Write(xWrt);
if (nError.IsError())
{
SAL_WARN("sw.ui", "ExportPaMToHTML: failed to export selection to HTML " << nError);
return {};
}
aResult
= OString(static_cast<const char*>(aMemoryStream.GetData()), aMemoryStream.GetSize());
aResult = aResult.replaceAll("<p"_ostr, "<span"_ostr);
aResult = aResult.replaceAll("</p>"_ostr, "</span>"_ostr);
// HTML has for that <br> and <p> also does new line
aResult = aResult.replaceAll("<ul>"_ostr, ""_ostr);
aResult = aResult.replaceAll("</ul>"_ostr, ""_ostr);
aResult = aResult.replaceAll("<ol>"_ostr, ""_ostr);
aResult = aResult.replaceAll("</ol>"_ostr, ""_ostr);
aResult = aResult.replaceAll("\n"_ostr, ""_ostr).trim();
return aResult;
}
return {};
}
void PasteHTMLToPaM(SwWrtShell& rWrtSh, const SwPaM* pCursor, const OString& rData)
{
SolarMutexGuard gMutex;
@@ -77,4 +45,4 @@ void PasteHTMLToPaM(SwWrtShell& rWrtSh, const SwPaM* pCursor, const OString& rDa
}
}
}
}
}
vcl/source/bitmap/BitmapTools.cxx
+2 -1
View File
@@ -282,6 +282,7 @@ Bitmap CreateFromData( RawBitmap&& rawBitmap )
return aBmp;
}
#if defined(_WIN32) && !USE_HEADLESS_CODE
void fillWithData(sal_uInt8* pData, Bitmap const& rBitmap)
{
BitmapScopedReadAccess aReadAccess(rBitmap);
@@ -303,7 +304,7 @@ void fillWithData(sal_uInt8* pData, Bitmap const& rBitmap)
}
}
}
#endif
#if ENABLE_CAIRO_CANVAS
Bitmap CreateFromCairoSurface(Size aSize, cairo_surface_t * pSurface)
vcl/source/pdf/pdfwriter.cxx
-5
View File
@@ -181,11 +181,6 @@ void PDFWriter::DrawBitmap( const Point& rDestPt, const Size& rDestSize, const B
xImplementation->drawBitmap( rDestPt, rDestSize, rBitmap, rGraphic );
}
void PDFWriter::DrawBitmap( const Point& rDestPt, const Size& rDestSize, const Bitmap& rBitmap )
{
xImplementation->drawBitmap( rDestPt, rDestSize, rBitmap );
}
void PDFWriter::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch )
{
xImplementation->drawHatch( rPolyPoly, rHatch );
vcl/source/treelist/treelistbox.cxx
+15 -32
View File
@@ -956,25 +956,6 @@ bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, S
return bSuccess;
}
void SvTreeListBox::RemoveSelection()
{
std::vector<const SvTreeListEntry*> aList;
// cache selection, as the implementation deselects everything on the first
// remove
SvTreeListEntry* pEntry = FirstSelected();
while ( pEntry )
{
aList.push_back( pEntry );
if ( pEntry->HasChildren() )
// remove deletes all children automatically
SelectChildren(pEntry, false);
pEntry = NextSelected( pEntry );
}
for (auto const& elem : aList)
RemoveEntry(elem);
}
void SvTreeListBox::RemoveEntry(SvTreeListEntry const* pEntry) { m_pModel->Remove(pEntry); }
void SvTreeListBox::RecalcViewData()
@@ -1480,7 +1461,21 @@ nAction
&& ( (g_pDDTarget && (g_pDDTarget->GetModel() != GetModel()))
|| !g_pDDTarget))
{
RemoveSelection();
std::vector<const SvTreeListEntry*> aList;
// cache selection, as the implementation deselects everything on the first
// remove
SvTreeListEntry* pEntry = FirstSelected();
while ( pEntry )
{
aList.push_back( pEntry );
if ( pEntry->HasChildren() )
// remove deletes all children automatically
SelectChildren(pEntry, false);
pEntry = NextSelected( pEntry );
}
for (auto const& elem : aList)
RemoveEntry(elem);
}
#endif
@@ -1918,18 +1913,6 @@ SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) cons
return eState;
}
bool SvTreeListBox::GetCheckButtonEnabled(SvTreeListEntry* pEntry) const
{
if (pEntry && (m_nTreeFlags & SvTreeFlags::CHKBTN))
{
SvLBoxButton* pItem
= static_cast<SvLBoxButton*>(pEntry->GetFirstItem(SvLBoxItemType::Button));
if (pItem)
return pItem->isEnable();
}
return false;
}
// TODO: Currently all data is cloned so that they conform to the default tree
// view format. Actually, the model should be used as a reference here. This
// leads to us _not_ calling SvTreeListEntry::Clone, but only its base class
vcl/source/window/window.cxx
-97
View File
@@ -3265,103 +3265,6 @@ VclPtr<vcl::Window> Window::GetParentWithLOKNotifier()
return pWindow;
}
namespace
{
std::string_view windowTypeName(WindowType nWindowType)
{
switch (nWindowType)
{
case WindowType::NONE: return "none";
case WindowType::MESSBOX: return "messagebox";
case WindowType::INFOBOX: return "infobox";
case WindowType::WARNINGBOX: return "warningbox";
case WindowType::ERRORBOX: return "errorbox";
case WindowType::QUERYBOX: return "querybox";
case WindowType::WINDOW: return "window";
case WindowType::WORKWINDOW: return "workwindow";
case WindowType::CONTAINER: return "container";
case WindowType::FLOATINGWINDOW: return "floatingwindow";
case WindowType::DIALOG: return "dialog";
case WindowType::MODELESSDIALOG: return "modelessdialog";
case WindowType::CONTROL: return "control";
case WindowType::PUSHBUTTON: return "pushbutton";
case WindowType::OKBUTTON: return "okbutton";
case WindowType::CANCELBUTTON: return "cancelbutton";
case WindowType::HELPBUTTON: return "helpbutton";
case WindowType::IMAGEBUTTON: return "imagebutton";
case WindowType::MENUBUTTON: return "menubutton";
case WindowType::MOREBUTTON: return "morebutton";
case WindowType::SPINBUTTON: return "spinbutton";
case WindowType::RADIOBUTTON: return "radiobutton";
case WindowType::CHECKBOX: return "checkbox";
case WindowType::TRISTATEBOX: return "tristatebox";
case WindowType::EDIT: return "edit";
case WindowType::MULTILINEEDIT: return "multilineedit";
case WindowType::COMBOBOX: return "combobox";
case WindowType::LISTBOX: return "listbox";
case WindowType::MULTILISTBOX: return "multilistbox";
case WindowType::FIXEDTEXT: return "fixedtext";
case WindowType::FIXEDLINE: return "fixedline";
case WindowType::FIXEDBITMAP: return "fixedbitmap";
case WindowType::FIXEDIMAGE: return "fixedimage";
case WindowType::GROUPBOX: return "groupbox";
case WindowType::SCROLLBAR: return "scrollbar";
case WindowType::SCROLLBARBOX: return "scrollbarbox";
case WindowType::SPLITTER: return "splitter";
case WindowType::SPLITWINDOW: return "splitwindow";
case WindowType::SPINFIELD: return "spinfield";
case WindowType::PATTERNFIELD: return "patternfield";
case WindowType::METRICFIELD: return "metricfield";
case WindowType::FORMATTEDFIELD: return "formattedfield";
case WindowType::CURRENCYFIELD: return "currencyfield";
case WindowType::DATEFIELD: return "datefield";
case WindowType::TIMEFIELD: return "timefield";
case WindowType::PATTERNBOX: return "patternbox";
case WindowType::NUMERICBOX: return "numericbox";
case WindowType::METRICBOX: return "metricbox";
case WindowType::CURRENCYBOX: return "currencybox";
case WindowType::DATEBOX: return "datebox";
case WindowType::TIMEBOX: return "timebox";
case WindowType::LONGCURRENCYBOX: return "longcurrencybox";
case WindowType::SCROLLWINDOW: return "scrollwindow";
case WindowType::TOOLBOX: return "toolbox";
case WindowType::DOCKINGWINDOW: return "dockingwindow";
case WindowType::STATUSBAR: return "statusbar";
case WindowType::TABPAGE: return "tabpage";
case WindowType::TABCONTROL: return "tabcontrol";
case WindowType::TABDIALOG: return "tabdialog";
case WindowType::BORDERWINDOW: return "borderwindow";
case WindowType::BUTTONDIALOG: return "buttondialog";
case WindowType::SYSTEMCHILDWINDOW: return "systemchildwindow";
case WindowType::SLIDER: return "slider";
case WindowType::MENUBARWINDOW: return "menubarwindow";
case WindowType::TREELISTBOX: return "treelistbox";
case WindowType::HELPTEXTWINDOW: return "helptextwindow";
case WindowType::INTROWINDOW: return "introwindow";
case WindowType::LISTBOXWINDOW: return "listboxwindow";
case WindowType::DOCKINGAREA: return "dockingarea";
case WindowType::RULER: return "ruler";
case WindowType::HEADERBAR: return "headerbar";
case WindowType::VERTICALTABCONTROL: return "verticaltabcontrol";
case WindowType::PROGRESSBAR: return "progressbar";
case WindowType::LINK_BUTTON: return "linkbutton";
// nothing to do here, but for completeness
case WindowType::TOOLKIT_FRAMEWINDOW: return "toolkit_framewindow";
case WindowType::TOOLKIT_SYSTEMCHILDWINDOW: return "toolkit_systemchildwindow";
}
return "none";
}
}
std::string_view Window::GetTypeName() const
{
return windowTypeName(GetType());
}
void Window::ImplCallDeactivateListeners( vcl::Window *pNew )
{
// no deactivation if the newly activated window is my child