diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2024-04-28 20:27:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-04-28 22:30:17 +0200 |
| commit | 5058a54d8d251837ad92478b91495c41497b670b (patch) | |
| tree | 7092c8779fadca53a9f3f0081ad5e14d89182dfb | |
| parent | 0cfaf93bf5c6e4e505b45f5e4fbac54edd77ddd6 (diff) | |
reduce symbol visibility
Change-Id: Iad2d114d257244f456d5579636e5c25ce070a08a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166805
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | bin/find-can-be-private-symbols.classes.results | 1 | ||||
| -rw-r--r-- | bin/find-can-be-private-symbols.functions.results | 287 | ||||
| -rw-r--r-- | include/basic/sbxobj.hxx | 46 | ||||
| -rw-r--r-- | include/basic/sbxvar.hxx | 76 | ||||
| -rw-r--r-- | include/editeng/unotext.hxx | 58 | ||||
| -rw-r--r-- | include/sfx2/app.hxx | 24 | ||||
| -rw-r--r-- | include/sfx2/templatedlg.hxx | 42 | ||||
| -rw-r--r-- | include/sfx2/thumbnailview.hxx | 42 | ||||
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 38 | ||||
| -rw-r--r-- | include/svl/undo.hxx | 26 | ||||
| -rw-r--r-- | include/svtools/brwbox.hxx | 42 | ||||
| -rw-r--r-- | include/svx/dlgctrl.hxx | 32 | ||||
| -rw-r--r-- | include/svx/framelinkarray.hxx | 36 | ||||
| -rw-r--r-- | include/svx/sdr/properties/defaultproperties.hxx | 36 | ||||
| -rw-r--r-- | include/tools/poly.hxx | 10 | ||||
| -rw-r--r-- | include/unotools/localedatawrapper.hxx | 22 | ||||
| -rw-r--r-- | include/vcl/test/GraphicsRenderTests.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/toolbox.hxx | 28 |
18 files changed, 283 insertions, 571 deletions
diff --git a/bin/find-can-be-private-symbols.classes.results b/bin/find-can-be-private-symbols.classes.results index 382030a5f7e9..90bd5c3310f3 100644 --- a/bin/find-can-be-private-symbols.classes.results +++ b/bin/find-can-be-private-symbols.classes.results @@ -1,5 +1,4 @@ 117 SkCanvas -106 GraphicsRenderTests 92 SkPath 72 accessibility::AccessibleEditableTextPara 72 SvTreeListBox diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index 566bd25ab31b..d2bed209d6bd 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -58,29 +58,6 @@ BitmapSolarizeFilter::execute(BitmapEx const&) const BitmapSymmetryCheck::checkImpl(BitmapReadAccess const*) BitmapWriteAccess::SetFillColor() BmpWriter(SvStream&, Graphic const&, FilterConfigItem*) -BrowseBox::BrowseBox(vcl::Window*, long, BrowserMode) -BrowseBox::Clear() -BrowseBox::Dispatch(unsigned short) -BrowseBox::DoHideCursor() -BrowseBox::DoShowCursor() -BrowseBox::DrawCursor() -BrowseBox::GetCursorHideCount() const -BrowseBox::GoToColumnId(unsigned short, bool, bool) -BrowseBox::GoToRow(int, bool, bool) -BrowseBox::ImplPaintData(OutputDevice&, tools::Rectangle const&, bool) -BrowseBox::IsFieldVisible(int, unsigned short, bool) const -BrowseBox::IsFrozen(unsigned short) const -BrowseBox::PaintData(vcl::Window const&, OutputDevice&, tools::Rectangle const&) -BrowseBox::ScrollColumns(int) -BrowseBox::ScrollRows(int) -BrowseBox::SetToggledSelectedColumn(unsigned short) -BrowseBox::StartScroll() -BrowseBox::ToggleSelectedColumn() -BrowseBox::commitBrowseBoxEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) -BrowseBox::commitHeaderBarEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&, bool) -BrowseBox::commitTableEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) -BrowseBox::getAccessibleFactory() -BrowseBox::isAccessibleAlive() const BuilderBase::collectAccelerator(xmlreader::XmlReader&, std::__debug::map<rtl::OUString, std::pair<rtl::OUString, rtl::OUString>, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, std::pair<rtl::OUString, rtl::OUString> > > >&) BuilderBase::collectAtkRelationAttribute(xmlreader::XmlReader&, std::__debug::map<rtl::OUString, rtl::OUString, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > >&) BuilderBase::collectAtkRoleAttribute(xmlreader::XmlReader&, std::__debug::map<rtl::OUString, rtl::OUString, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > >&) @@ -1287,17 +1264,6 @@ LinguMgr::GetProp() LinguMgr::GetSpell() LinguMgr::GetStandard() LinguMgr::GetThes() -LocaleDataWrapper::ImplAddFormatNum(rtl::OUStringBuffer&, long, unsigned short, bool, bool) const -LocaleDataWrapper::getAllInstalledLocaleNames() const -LocaleDataWrapper::getLanguageCountryInfo() const -LocaleDataWrapper::getMyLocale() const -LocaleDataWrapper::loadCurrencyFormats() -LocaleDataWrapper::loadData() -LocaleDataWrapper::loadDateAcceptancePatterns(std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) -LocaleDataWrapper::loadDateOrders() -LocaleDataWrapper::loadDigitGrouping() -LocaleDataWrapper::scanCurrFormatImpl(std::basic_string_view<char16_t, std::char_traits<char16_t> >, int, int&, int&, int&, int&, int&) const -LocaleDataWrapper::scanDateOrderImpl(std::basic_string_view<char16_t, std::char_traits<char16_t> >) const LogL10fromY LogL10toY LogL16fromY @@ -1847,69 +1813,6 @@ SbxMethod::Clear() SbxMethod::GetClass() const SbxMethod::SbxMethod(rtl::OUString const&, SbxDataType, bool) SbxMethod::~SbxMethod() -SbxObject::Call(rtl::OUString const&, SbxArray*) -SbxObject::Clear() -SbxObject::Dump(SvStream&, bool) -SbxObject::Find(rtl::OUString const&, SbxClassType) -SbxObject::FindQualified(rtl::OUString const&, SbxClassType) -SbxObject::GetClass() const -SbxObject::GetDfltProperty() -SbxObject::GetType() const -SbxObject::Insert(SbxVariable*) -SbxObject::IsClass(rtl::OUString const&) const -SbxObject::IsOptionCompatible() const -SbxObject::LoadData(SvStream&, unsigned short) -SbxObject::Make(rtl::OUString const&, SbxClassType, SbxDataType, bool) -SbxObject::Notify(SfxBroadcaster&, SfxHint const&) -SbxObject::QuickInsert(SbxVariable*) -SbxObject::Remove(SbxVariable*) -SbxObject::Remove(rtl::OUString const&, SbxClassType) -SbxObject::SbxObject(SbxObject const&) -SbxObject::SbxObject(rtl::OUString const&) -SbxObject::SetDfltProperty(rtl::OUString const&) -SbxObject::StoreData(SvStream&) const -SbxObject::operator=(SbxObject const&) -SbxObject::~SbxObject() -SbxValue::Convert(SbxDataType) -SbxValue::Format(rtl::OUString&, rtl::OUString const*) const -SbxValue::GetCoreString() const -SbxValue::ImpIsNumeric(bool) const -SbxValue::IsNumericRTL() const -SbxValue::PutByte(unsigned char) -SbxValue::PutCurrency(long) -SbxValue::PutDate(double) -SbxValue::PutDecimal(SbxDecimal*) -SbxValue::PutDecimal(com::sun::star::bridge::oleautomation::Decimal const&) -SbxValue::PutErr(unsigned short) -SbxValue::PutInt64(long) -SbxValue::PutInteger(short) -SbxValue::PutNull() -SbxValue::PutSingle(float) -SbxValue::PutUInt64(unsigned long) -SbxValue::SbxValue(SbxDataType) -SbxValue::Scan(rtl::OUString const&, unsigned short*) -SbxValue::ScanNumIntnl(rtl::OUString const&, double&, bool) -SbxValue::SetType(SbxDataType) -SbxValue::fillAutomationDecimal(com::sun::star::bridge::oleautomation::Decimal&) const -SbxVariable::Broadcast(SfxHintId) -SbxVariable::ClearComListener() -SbxVariable::Dump(SvStream&, bool) -SbxVariable::GetClass() const -SbxVariable::GetDeclareClassName() const -SbxVariable::GetInfo() -SbxVariable::GetType() const -SbxVariable::LoadData(SvStream&, unsigned short) -SbxVariable::NameToCaseInsensitiveName(rtl::OUString const&) -SbxVariable::SbxVariable(SbxVariable const&) -SbxVariable::SetComListener(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, StarBASIC*) -SbxVariable::SetDeclareClassName(rtl::OUString const&) -SbxVariable::SetInfo(SbxInfo*) -SbxVariable::SetModified(bool) -SbxVariable::SetName(rtl::OUString const&) -SbxVariable::SetParent(SbxObject*) -SbxVariable::StoreData(SvStream&) const -SbxVariable::operator=(SbxVariable const&) -SbxVariable::~SbxVariable() ScAppOptions::ScAppOptions() ScAppOptions::SetDefaults() ScAppOptions::SetLRUFuncList(unsigned short const*, unsigned short) @@ -3652,20 +3555,6 @@ SelectionListenerMultiplexer::release() SelectionListenerMultiplexer::selectionChanged(com::sun::star::awt::grid::GridSelectionEvent const&) SfxAllItemSet::Clone(bool, SfxItemPool*) const SfxAllItemSet::PutImpl(SfxPoolItem const&, bool) -SfxApplication::Deinitialize() -SfxApplication::GetDdeService() const -SfxApplication::GetFreeIndex() -SfxApplication::GetProgress() const -SfxApplication::GetSidebarTheme() -SfxApplication::GetStaticInterface() -SfxApplication::InitInterface_Impl() -SfxApplication::InitializeDde() -SfxApplication::Invalidate(unsigned short) -SfxApplication::MacroOrganizer(weld::Window*, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&, short) -SfxApplication::RegisterInterface(SfxModule const*) -SfxApplication::ReleaseIndex(unsigned short) -SfxApplication::SfxApplication() -SfxApplication::~SfxApplication() SfxBaseModel::IsInitialized() const SfxBaseModel::MethodEntryCheck(bool) const SfxBaseModel::changing() @@ -4119,27 +4008,6 @@ SfxTemplateItem::PutValue(com::sun::star::uno::Any const&, unsigned char) SfxTemplateItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const SfxTemplateItem::SfxTemplateItem() SfxTemplateItem::operator==(SfxPoolItem const&) const -SfxTemplateManagerDlg::DefaultTemplateMenuSelectHdl(std::basic_string_view<char16_t, std::char_traits<char16_t> >) -SfxTemplateManagerDlg::ExtensionsActionHdl() -SfxTemplateManagerDlg::ImportActionHdl() -SfxTemplateManagerDlg::OnCategoryDelete() -SfxTemplateManagerDlg::OnCategoryNew() -SfxTemplateManagerDlg::OnCategoryRename() -SfxTemplateManagerDlg::OnTemplateExport() -SfxTemplateManagerDlg::OnTemplateImportCategory(std::basic_string_view<char16_t, std::char_traits<char16_t> >) -SfxTemplateManagerDlg::OnTemplateOpen() -SfxTemplateManagerDlg::OnTemplateState(ThumbnailViewItem const*) -SfxTemplateManagerDlg::SearchUpdate() -SfxTemplateManagerDlg::fillFolderComboBox() -SfxTemplateManagerDlg::getApplicationSpecificSettings() -SfxTemplateManagerDlg::getCurrentApplicationFilter() const -SfxTemplateManagerDlg::getTemplateViewMode() const -SfxTemplateManagerDlg::localMoveTo(unsigned short) -SfxTemplateManagerDlg::readSettings() -SfxTemplateManagerDlg::setDocumentModel(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&) -SfxTemplateManagerDlg::setTemplateViewMode(TemplateViewMode) -SfxTemplateManagerDlg::updateMenuItems() -SfxTemplateManagerDlg::writeSettings() SfxTemplatePanelControl::NotifyItemUpdate(unsigned short, SfxItemState, SfxPoolItem const*) SfxToolBoxControl::CreateControl(unsigned short, o3tl::strong_int<unsigned short, ToolBoxItemIdTag>, ToolBox*, SfxModule const*) SfxToolBoxControl::CreateImpl(unsigned short, o3tl::strong_int<unsigned short, ToolBoxItemIdTag>, ToolBox&) @@ -4147,18 +4015,6 @@ SfxToolBoxControl::RegisterControl(unsigned short, SfxModule*) SfxUndoAction::GetDateTime() const SfxUndoArray::Remove(unsigned long, unsigned long) SfxUndoArray::~SfxUndoArray() -SfxUndoManager::ImplAddUndoAction_NoNotify(std::unique_ptr<SfxUndoAction, std::default_delete<SfxUndoAction> >, bool, bool, svl::undo::impl::UndoManagerGuard&) -SfxUndoManager::ImplCheckEmptyActions() -SfxUndoManager::ImplClearCurrentLevel_NoNotify(svl::undo::impl::UndoManagerGuard&) -SfxUndoManager::ImplClearRedo(svl::undo::impl::UndoManagerGuard&, bool) -SfxUndoManager::ImplClearUndo(svl::undo::impl::UndoManagerGuard&) -SfxUndoManager::ImplEnableUndo_Lock(bool) -SfxUndoManager::ImplGetRedoActionCount_Lock(bool) const -SfxUndoManager::ImplIsInListAction_Lock() const -SfxUndoManager::ImplIsUndoEnabled_Lock() const -SfxUndoManager::ImplLeaveListAction(bool, svl::undo::impl::UndoManagerGuard&) -SfxUndoManager::ImplRedo(SfxUndoContext*) -SfxUndoManager::ImplUndo(SfxUndoContext*) SfxUnoAnyItem::Clone(SfxItemPool*) const SfxUnoAnyItem::PutValue(com::sun::star::uno::Any const&, unsigned char) SfxUnoAnyItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const @@ -4171,27 +4027,6 @@ SfxUnoFrameItem::operator==(SfxPoolItem const&) const SfxViewFactory::CreateInstance(SfxViewFrame&, SfxViewShell*) SfxViewFactory::GetAPIViewName() const SfxViewFactory::GetLegacyViewName() const -SfxViewFrame::Activate(bool) -SfxViewFrame::AppendContainsMacrosInfobar() -SfxViewFrame::ChildWindowState(SfxItemSet&) -SfxViewFrame::Close() -SfxViewFrame::Deactivate(bool) -SfxViewFrame::DoActivate(bool) -SfxViewFrame::DoAdjustPosSizePixel(SfxViewShell*, Point const&, Size const&, bool) -SfxViewFrame::DoDeactivate(bool, SfxViewFrame const*) -SfxViewFrame::Get(com::sun::star::uno::Reference<com::sun::star::frame::XController> const&, SfxObjectShell const*) -SfxViewFrame::GetProgress() const -SfxViewFrame::GetStaticInterface() -SfxViewFrame::HandleSecurityInfobar(rtl::OUString const&) -SfxViewFrame::InitInterface_Impl() -SfxViewFrame::Notify(SfxBroadcaster&, SfxHint const&) -SfxViewFrame::RegisterInterface(SfxModule const*) -SfxViewFrame::SetModalMode(bool) -SfxViewFrame::SetViewFrame(SfxViewFrame*) -SfxViewFrame::SfxViewFrame(SfxFrame&, SfxObjectShell*) -SfxViewFrame::UpdateInfoBar(std::basic_string_view<char16_t, std::char_traits<char16_t> >, rtl::OUString const&, rtl::OUString const&, InfobarType) -SfxViewFrame::UpdateTitle() -SfxViewFrame::~SfxViewFrame() SfxViewFrameItem::Clone(SfxItemPool*) const SfxViewFrameItem::operator==(SfxPoolItem const&) const SfxViewShell::GetActivePrinter() const @@ -7535,22 +7370,6 @@ SvxPatternListItem::QueryValue(com::sun::star::uno::Any&, unsigned char) const SvxPatternListItem::SvxPatternListItem() SvxPatternListItem::SvxPatternListItem(SvxPatternListItem const&) SvxPatternListItem::operator==(SfxPoolItem const&) const -SvxPixelCtl::ChangePixel(unsigned short) -SvxPixelCtl::CreateAccessible() -SvxPixelCtl::GetBitmapPixel(unsigned short) const -SvxPixelCtl::GetFocus() -SvxPixelCtl::GetFocusPosIndex() const -SvxPixelCtl::GetFocusRect() -SvxPixelCtl::IndexToPoint(long) const -SvxPixelCtl::KeyInput(KeyEvent const&) -SvxPixelCtl::LoseFocus() -SvxPixelCtl::MouseButtonDown(MouseEvent const&) -SvxPixelCtl::Paint(OutputDevice&, tools::Rectangle const&) -SvxPixelCtl::PointToIndex(Point const&) const -SvxPixelCtl::Resize() -SvxPixelCtl::SetDrawingArea(weld::DrawingArea*) -SvxPixelCtl::ShowPosition(Point const&) -SvxPixelCtl::implCalFocusRect(Point const&) SvxPosSizeStatusBarControl::Command(CommandEvent const&) SvxPosSizeStatusBarControl::CreateImpl(unsigned short, unsigned short, StatusBar&) SvxPosSizeStatusBarControl::ImplUpdateItemText() @@ -8048,35 +7867,6 @@ SvxUnoTextRange::getTypes() SvxUnoTextRange::queryAggregation(com::sun::star::uno::Type const&) SvxUnoTextRange::queryInterface(com::sun::star::uno::Type const&) SvxUnoTextRange::~SvxUnoTextRange() -SvxUnoTextRangeBase::CollapseToEnd() -SvxUnoTextRangeBase::CollapseToStart() -SvxUnoTextRangeBase::GoLeft(int, bool) -SvxUnoTextRangeBase::GoRight(int, bool) -SvxUnoTextRangeBase::GotoEnd(bool) -SvxUnoTextRangeBase::GotoStart(bool) -SvxUnoTextRangeBase::IsCollapsed() -SvxUnoTextRangeBase::SvxUnoTextRangeBase(SvxEditSource const*, SvxItemPropertySet const*) -SvxUnoTextRangeBase::SvxUnoTextRangeBase(SvxItemPropertySet const*) -SvxUnoTextRangeBase::SvxUnoTextRangeBase(SvxUnoTextRangeBase const&) -SvxUnoTextRangeBase::_getOnePropertyStates(SfxItemSet const&, SfxItemPropertyMapEntry const*, com::sun::star::beans::PropertyState&) -SvxUnoTextRangeBase::_getPropertyState(SfxItemPropertyMapEntry const*, int) -SvxUnoTextRangeBase::_getPropertyState(std::basic_string_view<char16_t, std::char_traits<char16_t> >, int) -SvxUnoTextRangeBase::_getPropertyStates(com::sun::star::uno::Sequence<rtl::OUString> const&, int) -SvxUnoTextRangeBase::_getPropertyValue(rtl::OUString const&, int) -SvxUnoTextRangeBase::_getPropertyValues(com::sun::star::uno::Sequence<rtl::OUString> const&, int) -SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder*, SfxItemPropertyMapEntry const*, int) -SvxUnoTextRangeBase::_setPropertyToDefault(rtl::OUString const&, int) -SvxUnoTextRangeBase::_setPropertyValue(rtl::OUString const&, com::sun::star::uno::Any const&, int) -SvxUnoTextRangeBase::_setPropertyValues(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, int) -SvxUnoTextRangeBase::getEnd() -SvxUnoTextRangeBase::getPropertyValue(SfxItemPropertyMapEntry const*, com::sun::star::uno::Any&, SfxItemSet const&) -SvxUnoTextRangeBase::getStart() -SvxUnoTextRangeBase::getString() -SvxUnoTextRangeBase::getSupportedServiceNames() -SvxUnoTextRangeBase::getSupportedServiceNames_Static() -SvxUnoTextRangeBase::setPropertyValue(SfxItemPropertyMapEntry const*, com::sun::star::uno::Any const&, ESelection const&, SfxItemSet const&, SfxItemSet&) -SvxUnoTextRangeBase::setString(rtl::OUString const&) -SvxUnoTextRangeBase::~SvxUnoTextRangeBase() SvxVerJustifyItem::GetPresentation(SfxItemPresentation, MapUnit, MapUnit, rtl::OUString&, IntlWrapper const&) const SvxVerJustifyItem::GetValueCount() const SvxVerJustifyItem::GetValueText(SvxCellVerJustify) @@ -9447,27 +9237,6 @@ TextSelection::TextSelection(TextPaM const&) Throbber::Resize() Throbber::dispose() Throbber::~Throbber() -ThumbnailView::CalculateItemPositions(bool) -ThumbnailView::DrawItem(ThumbnailViewItem const*) -ThumbnailView::GetItemId(unsigned long) const -ThumbnailView::GetItemPos(unsigned short) const -ThumbnailView::ImplDeleteItems() -ThumbnailView::ImplFireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) -ThumbnailView::ImplGetItem(Point const&) const -ThumbnailView::ImplGetItem(unsigned long) -ThumbnailView::ImplGetVisibleItem(unsigned short) -ThumbnailView::ImplGetVisibleItemCount() const -ThumbnailView::ImplHasAccessibleListeners() const -ThumbnailView::ImplInit() -ThumbnailView::IsItemSelected(unsigned short) const -ThumbnailView::MakeItemVisible(unsigned short) -ThumbnailView::RemoveItem(unsigned short) -ThumbnailView::ShowTooltips(bool) -ThumbnailView::UpdateColors() -ThumbnailView::filterItems(std::function<bool (ThumbnailViewItem const*)> const&) -ThumbnailView::getAccessible() const -ThumbnailView::setItemMaxTextLength(unsigned int) -ThumbnailView::updateItems(std::__debug::vector<std::unique_ptr<ThumbnailViewItem, std::default_delete<ThumbnailViewItem> >, std::allocator<std::unique_ptr<ThumbnailViewItem, std::default_delete<ThumbnailViewItem> > > >) ThumbnailViewItem::GetAccessible(bool) ThumbnailViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D*, ThumbnailItemAttributes const*) ThumbnailViewItem::addTextPrimitives(rtl::OUString const&, ThumbnailItemAttributes const*, Point, drawinglayer::primitive2d::Primitive2DContainer&) @@ -9509,21 +9278,6 @@ TimeFormatter::TimeFormatter(Edit*) TimeFormatter::~TimeFormatter() Timer::Invoke(Timer*) Timer::Timer(bool, char const*) -ToolBox::CalcFloatingWindowSizePixel(unsigned long) -ToolBox::CopyItem(ToolBox const&, o3tl::strong_int<unsigned short, ToolBoxItemIdTag>) -ToolBox::DoubleClick() -ToolBox::ExecuteCustomMenu(tools::Rectangle const&) -ToolBox::GetDefaultImageSize() const -ToolBox::GetItemId(Point const&) const -ToolBox::GetItemImage(o3tl::strong_int<unsigned short, ToolBoxItemIdTag>) const -ToolBox::GetOverflowRect() const -ToolBox::Highlight() -ToolBox::IsMenuEnabled() const -ToolBox::Lock(bool) -ToolBox::SetAccessibleName(o3tl::strong_int<unsigned short, ToolBoxItemIdTag>, rtl::OUString const&) -ToolBox::SetItemExpand(o3tl::strong_int<unsigned short, ToolBoxItemIdTag>, bool) -ToolBox::ShowLine(bool) -ToolBox::UpdateCustomMenu() ToolbarPopupContainer::unsetPopover() ToolbarUnoDispatcher::CreateController(rtl::OUString const&) ToolbarUnoDispatcher::GetIconSize() @@ -15046,24 +14800,6 @@ sdr::properties::BaseProperties::SetMergedItemSetAndBroadcast(SfxItemSet const&, sdr::properties::BaseProperties::dumpAsXml(_xmlTextWriter*) const sdr::properties::BaseProperties::getVersion() const sdr::properties::BaseProperties::~BaseProperties() -sdr::properties::DefaultProperties::AllowItemChange(unsigned short, SfxPoolItem const*) const -sdr::properties::DefaultProperties::ClearObjectItem(unsigned short) -sdr::properties::DefaultProperties::ClearObjectItemDirect(unsigned short) -sdr::properties::DefaultProperties::Clone(SdrObject&) const -sdr::properties::DefaultProperties::CreateObjectSpecificItemSet(SfxItemPool&) -sdr::properties::DefaultProperties::DefaultProperties(sdr::properties::DefaultProperties const&, SdrObject&) -sdr::properties::DefaultProperties::ForceDefaultAttributes() -sdr::properties::DefaultProperties::GetObjectItemSet() const -sdr::properties::DefaultProperties::GetStyleSheet() const -sdr::properties::DefaultProperties::ItemChange(unsigned short, SfxPoolItem const*) -sdr::properties::DefaultProperties::ItemSetChanged(std::span<SfxPoolItem const* const, 18446744073709551615ul>, unsigned short) -sdr::properties::DefaultProperties::PostItemChange(unsigned short) -sdr::properties::DefaultProperties::SetObjectItem(SfxPoolItem const&) -sdr::properties::DefaultProperties::SetObjectItemDirect(SfxPoolItem const&) -sdr::properties::DefaultProperties::SetObjectItemSet(SfxItemSet const&) -sdr::properties::DefaultProperties::SetStyleSheet(SfxStyleSheet*, bool, bool) -sdr::properties::DefaultProperties::dumpAsXml(_xmlTextWriter*) const -sdr::properties::DefaultProperties::~DefaultProperties() sdr::table::Cell::IsTextEditActive() const sdr::table::Cell::dumpAsXml(_xmlTextWriter*, int, int) const sdr::table::SdrTableObj::AddToHdlList(SdrHdlList&) const @@ -15754,24 +15490,6 @@ svx::diagram::DiagramDataState::DiagramDataState(std::__debug::vector<svx::diagr svx::diagram::DiagramFrameHdl::CreateB2dIAObject() svx::diagram::DiagramFrameHdl::DiagramFrameHdl(basegfx::B2DHomMatrix const&) svx::diagram::IDiagramHelper::AddAdditionalVisualization(SdrObjGroup const&, SdrHdlList&) -svx::frame::Array::GetB2DRange(int, int, int, int) const -svx::frame::Array::GetCellCount() const -svx::frame::Array::GetCellStyleBL(int, int) const -svx::frame::Array::GetCellStyleBLTR(int, int) const -svx::frame::Array::GetCellStyleBR(int, int) const -svx::frame::Array::GetCellStyleBottom(int, int) const -svx::frame::Array::GetCellStyleLeft(int, int) const -svx::frame::Array::GetCellStyleRight(int, int) const -svx::frame::Array::GetCellStyleTL(int, int) const -svx::frame::Array::GetCellStyleTLBR(int, int) const -svx::frame::Array::GetCellStyleTR(int, int) const -svx::frame::Array::GetCellStyleTop(int, int) const -svx::frame::Array::GetColPosition(int) const -svx::frame::Array::GetColWidth(int, int) const -svx::frame::Array::GetMergedOrigin(int&, int&, int, int) const -svx::frame::Array::GetMergedRange(int&, int&, int&, int&, int, int) const -svx::frame::Array::GetRowHeight(int, int) const -svx::frame::Array::GetRowPosition(int) const svx::frame::Style::Set(double, double, double) svx::frame::Style::hashCode() const svx::sidebar::AreaPropertyPanelBase::FillStyleChanged(bool) @@ -15856,11 +15574,6 @@ tools::JsonWriter::ensureSpaceAndWriteNameColon(std::basic_string_view<char, std tools::JsonWriter::writeEscapedOUString(std::basic_string_view<char16_t, std::char_traits<char16_t> >) tools::Line::Intersection(tools::Line const&, Point&) const tools::PolyPolygon::Remove(unsigned short) -tools::Polygon::Clear() -tools::Polygon::ImplRead(SvStream&) -tools::Polygon::ImplReduceEdges(tools::Polygon&, double const&, unsigned short) -tools::Polygon::ImplWrite(SvStream&) const -tools::Polygon::IsRect() const tools::Time::GetNSFromTime() const tools::Time::MakeTimeFromNS(long) tools::Time::init(unsigned int, unsigned int, unsigned int, unsigned long) diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index d9fd229c1d94..fbc8bbf9d70b 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -37,49 +37,49 @@ protected: SbxProperty* pDfltProp; // Default-Property OUString aClassName; // Classname OUString aDfltPropName; - virtual bool LoadData( SvStream&, sal_uInt16 ) override; - virtual std::pair<bool, sal_uInt32> StoreData( SvStream& ) const override; - virtual ~SbxObject() override; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual bool IsOptionCompatible() const; // Module's Option Compatible + SAL_DLLPRIVATE virtual bool LoadData( SvStream&, sal_uInt16 ) override; + SAL_DLLPRIVATE virtual std::pair<bool, sal_uInt32> StoreData( SvStream& ) const override; + SAL_DLLPRIVATE virtual ~SbxObject() override; + SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; + SAL_DLLPRIVATE virtual bool IsOptionCompatible() const; // Module's Option Compatible public: SBX_DECL_PERSIST_NODATA(SBXID_OBJECT,1); - SbxObject( const OUString& rClassname ); - SbxObject( const SbxObject& ); - SbxObject& operator=( const SbxObject& ); - virtual SbxDataType GetType() const override; - virtual SbxClassType GetClass() const override; - virtual void Clear() override; + SAL_DLLPRIVATE SbxObject( const OUString& rClassname ); + SAL_DLLPRIVATE SbxObject( const SbxObject& ); + SAL_DLLPRIVATE SbxObject& operator=( const SbxObject& ); + SAL_DLLPRIVATE virtual SbxDataType GetType() const override; + SAL_DLLPRIVATE virtual SbxClassType GetClass() const override; + SAL_DLLPRIVATE virtual void Clear() override; - virtual bool IsClass( const OUString& ) const; + SAL_DLLPRIVATE virtual bool IsClass( const OUString& ) const; const OUString& GetClassName() const { return aClassName; } void SetClassName( const OUString &rNew ) { aClassName = rNew; } // Default-Property - SbxProperty* GetDfltProperty(); - void SetDfltProperty( const OUString& r ); + SAL_DLLPRIVATE SbxProperty* GetDfltProperty(); + SAL_DLLPRIVATE void SetDfltProperty( const OUString& r ); // Search for an element - virtual SbxVariable* Find( const OUString&, SbxClassType ); - SbxVariable* FindQualified( const OUString&, SbxClassType ); + SAL_DLLPRIVATE virtual SbxVariable* Find( const OUString&, SbxClassType ); + SAL_DLLPRIVATE SbxVariable* FindQualified( const OUString&, SbxClassType ); // Quick-Call-Interface for Methods - virtual bool Call( const OUString&, SbxArray* = nullptr ); + SAL_DLLPRIVATE virtual bool Call( const OUString&, SbxArray* = nullptr ); // Execution of DDE-Commands SbxVariable* Execute( const OUString& ); // Manage elements - SbxVariable* Make( const OUString&, SbxClassType, SbxDataType, bool bIsRuntimeFunction = false ); - virtual void Insert( SbxVariable* ); + SAL_DLLPRIVATE SbxVariable* Make( const OUString&, SbxClassType, SbxDataType, bool bIsRuntimeFunction = false ); + SAL_DLLPRIVATE virtual void Insert( SbxVariable* ); // AB 23.4.1997, Optimization, Insertion without check for duplicate Entries and // without Broadcasts, only used in SO2/auto.cxx - void QuickInsert( SbxVariable* ); - void Remove( const OUString&, SbxClassType ); - virtual void Remove( SbxVariable* ); + SAL_DLLPRIVATE void QuickInsert( SbxVariable* ); + SAL_DLLPRIVATE void Remove( const OUString&, SbxClassType ); + SAL_DLLPRIVATE virtual void Remove( SbxVariable* ); // Direct access on arrays SbxArray* GetMethods() { return pMethods.get(); } SbxArray* GetProperties() { return pProps.get(); } SbxArray* GetObjects() { return pObjs.get(); } // Debugging - void Dump( SvStream&, bool bDumpAll ); + SAL_DLLPRIVATE void Dump( SvStream&, bool bDumpAll ); }; #endif // INCLUDED_BASIC_SBXOBJ_HXX diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 1b0372f82c7d..cf18367d5430 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -107,7 +107,7 @@ protected: public: SBX_DECL_PERSIST_NODATA(SBXID_VALUE,1); SbxValue(); - SbxValue( SbxDataType ); + SAL_DLLPRIVATE SbxValue( SbxDataType ); SbxValue( const SbxValue& ); SbxValue& operator=( const SbxValue& ); virtual void Clear() override; @@ -124,12 +124,12 @@ public: bool IsEmpty() const { return GetType() == SbxEMPTY ; } bool IsNull() const { return GetType() == SbxNULL ; } bool IsNumeric() const; - bool IsNumericRTL() const; // #41692 Interface for Basic - bool ImpIsNumeric( bool bOnlyIntntl ) const; // Implementation + SAL_DLLPRIVATE bool IsNumericRTL() const; // #41692 Interface for Basic + SAL_DLLPRIVATE bool ImpIsNumeric( bool bOnlyIntntl ) const; // Implementation virtual SbxDataType GetType() const override; SbxDataType GetFullType() const { return aData.eType;} - bool SetType( SbxDataType ); + SAL_DLLPRIVATE bool SetType( SbxDataType ); bool Get( SbxValues& ) const; const SbxValues& GetValues_Impl() const { return aData; } @@ -151,7 +151,7 @@ public: double GetDate() const { return Get(SbxDATE).nDouble; } bool GetBool() const { return Get(SbxBOOL).nUShort != 0; } - const OUString& GetCoreString() const; + SAL_DLLPRIVATE const OUString& GetCoreString() const; OUString GetOUString() const; SbxBase* GetObject() const { return Get(SbxOBJECT).pObj; } @@ -159,39 +159,39 @@ public: sal_uInt16 GetUShort() const { return Get(SbxUSHORT).nUShort; } sal_uInt32 GetULong() const { return Get(SbxULONG).nULong; } - bool PutInteger( sal_Int16 ); + SAL_DLLPRIVATE bool PutInteger( sal_Int16 ); bool PutLong( sal_Int32 ); - bool PutSingle( float ); + SAL_DLLPRIVATE bool PutSingle( float ); bool PutDouble( double ); - void PutDate( double ); + SAL_DLLPRIVATE void PutDate( double ); bool PutBool( bool ); - void PutErr( sal_uInt16 ); + SAL_DLLPRIVATE void PutErr( sal_uInt16 ); void PutStringExt( const OUString& ); // with extended analysis (International, "sal_True"/"sal_False") - bool PutInt64( sal_Int64 ); - bool PutUInt64( sal_uInt64 ); + SAL_DLLPRIVATE bool PutInt64( sal_Int64 ); + SAL_DLLPRIVATE bool PutUInt64( sal_uInt64 ); bool PutString( const OUString& ); bool PutChar( sal_Unicode ); - bool PutByte( sal_uInt8 ); + SAL_DLLPRIVATE bool PutByte( sal_uInt8 ); bool PutUShort( sal_uInt16 ); bool PutULong( sal_uInt32 ); bool PutEmpty(); - void PutNull(); + SAL_DLLPRIVATE void PutNull(); // Special methods - void PutDecimal( css::bridge::oleautomation::Decimal const & rAutomationDec ); - bool PutDecimal( SbxDecimal* pDecimal ); // This function is needed for Windows build, don't remove - void fillAutomationDecimal( css::bridge::oleautomation::Decimal& rAutomationDec ) const; - bool PutCurrency( sal_Int64 ); + SAL_DLLPRIVATE void PutDecimal( css::bridge::oleautomation::Decimal const & rAutomationDec ); + SAL_DLLPRIVATE bool PutDecimal( SbxDecimal* pDecimal ); // This function is needed for Windows build, don't remove + SAL_DLLPRIVATE void fillAutomationDecimal( css::bridge::oleautomation::Decimal& rAutomationDec ) const; + SAL_DLLPRIVATE bool PutCurrency( sal_Int64 ); // Interface for CDbl in Basic - static ErrCode ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false ); + SAL_DLLPRIVATE static ErrCode ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false ); bool PutObject( SbxBase* ); - bool Convert( SbxDataType ); + SAL_DLLPRIVATE bool Convert( SbxDataType ); bool Compute( SbxOperator, const SbxValue& ); bool Compare( SbxOperator, const SbxValue& ) const; - bool Scan( const OUString&, sal_uInt16* ); - void Format( OUString&, const OUString* = nullptr ) const; + SAL_DLLPRIVATE bool Scan( const OUString&, sal_uInt16* ); + SAL_DLLPRIVATE void Format( OUString&, const OUString* = nullptr ) const; // The following operators are defined for easier handling. // TODO: Ensure error conditions (overflow, conversions) @@ -256,34 +256,34 @@ protected: SbxInfoRef pInfo; // Probably called information sal_uInt32 nUserData= 0; // User data for Call() SbxObject* pParent = nullptr; // Currently attached object - virtual ~SbxVariable() override; - virtual bool LoadData( SvStream&, sal_uInt16 ) override; - virtual std::pair<bool, sal_uInt32> StoreData( SvStream& ) const override; + SAL_DLLPRIVATE virtual ~SbxVariable() override; + SAL_DLLPRIVATE virtual bool LoadData( SvStream&, sal_uInt16 ) override; + SAL_DLLPRIVATE virtual std::pair<bool, sal_uInt32> StoreData( SvStream& ) const override; public: SBX_DECL_PERSIST_NODATA(SBXID_VARIABLE,2); SbxVariable(); SbxVariable( SbxDataType ); - SbxVariable( const SbxVariable& ); + SAL_DLLPRIVATE SbxVariable( const SbxVariable& ); SbxVariable& operator=( const SbxVariable& ); - void Dump( SvStream&, bool bDumpAll ); + SAL_DLLPRIVATE void Dump( SvStream&, bool bDumpAll ); - void SetName( const OUString& ); + SAL_DLLPRIVATE void SetName( const OUString& ); const OUString& GetName( SbxNameType = SbxNameType::NONE ) const; sal_uInt16 GetHashCode() const { return nHash; } - static OUString NameToCaseInsensitiveName(const OUString& rName); + SAL_DLLPRIVATE static OUString NameToCaseInsensitiveName(const OUString& rName); - virtual void SetModified( bool ) override; + SAL_DLLPRIVATE virtual void SetModified( bool ) override; sal_uInt32 GetUserData() const { return nUserData; } void SetUserData( sal_uInt32 n ) { nUserData = n; } - virtual SbxDataType GetType() const override; - virtual SbxClassType GetClass() const; + SAL_DLLPRIVATE virtual SbxDataType GetType() const override; + SAL_DLLPRIVATE virtual SbxClassType GetClass() const; // Parameter-Interface - virtual SbxInfo* GetInfo(); - void SetInfo( SbxInfo* p ); + SAL_DLLPRIVATE virtual SbxInfo* GetInfo(); + SAL_DLLPRIVATE void SetInfo( SbxInfo* p ); void SetParameters( SbxArray* p ); SbxArray* GetParameters() const; @@ -295,13 +295,13 @@ public: const SbxObject* GetParent() const { return pParent; } SbxObject* GetParent() { return pParent;} - virtual void SetParent( SbxObject* ); + SAL_DLLPRIVATE virtual void SetParent( SbxObject* ); - const OUString& GetDeclareClassName() const; - void SetDeclareClassName( const OUString& ); - void SetComListener( const css::uno::Reference< css::uno::XInterface >& xComListener, + SAL_DLLPRIVATE const OUString& GetDeclareClassName() const; + SAL_DLLPRIVATE void SetDeclareClassName( const OUString& ); + SAL_DLLPRIVATE void SetComListener( const css::uno::Reference< css::uno::XInterface >& xComListener, StarBASIC* pParentBasic ); - void ClearComListener(); + SAL_DLLPRIVATE void ClearComListener(); // Create a simple hashcode: the first six characters are evaluated. static constexpr sal_uInt16 MakeHashCode(std::u16string_view aName) diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 844d15cb82cb..bb3d8c708606 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -268,51 +268,51 @@ protected: /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, sal_Int32 nPara = -1 ); + SAL_DLLPRIVATE void _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ); + SAL_DLLPRIVATE css::uno::Any _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ); /// @throws css::beans::PropertyVetoException /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void _setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, sal_Int32 nPara = -1 ); + SAL_DLLPRIVATE void _setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, sal_Int32 nPara = -1 ); /// @throws css::uno::RuntimeException - css::uno::Sequence< css::uno::Any > _getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ); + SAL_DLLPRIVATE css::uno::Sequence< css::uno::Any > _getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::beans::PropertyState _getPropertyState( const SfxItemPropertyMapEntry* pMap, sal_Int32 nPara = -1 ); + SAL_DLLPRIVATE css::beans::PropertyState _getPropertyState( const SfxItemPropertyMapEntry* pMap, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::beans::PropertyState _getPropertyState( std::u16string_view PropertyName, sal_Int32 nPara = -1 ); + SAL_DLLPRIVATE css::beans::PropertyState _getPropertyState( std::u16string_view PropertyName, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::uno::Sequence< css::beans::PropertyState > _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ); + SAL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyState > _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ); // returns true if property found or false if unknown property - static bool _getOnePropertyStates(const SfxItemSet& rSet, const SfxItemPropertyMapEntry* pMap, css::beans::PropertyState& rState); + SAL_DLLPRIVATE static bool _getOnePropertyStates(const SfxItemSet& rSet, const SfxItemPropertyMapEntry* pMap, css::beans::PropertyState& rState); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - void _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ); + SAL_DLLPRIVATE void _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertyMapEntry* pMap, sal_Int32 nPara ); + SAL_DLLPRIVATE void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertyMapEntry* pMap, sal_Int32 nPara ); void SetEditSource( SvxEditSource* _pEditSource ) noexcept; /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - void getPropertyValue( const SfxItemPropertyMapEntry* pMap, css::uno::Any& rAny, const SfxItemSet& rSet ); + SAL_DLLPRIVATE void getPropertyValue( const SfxItemPropertyMapEntry* pMap, css::uno::Any& rAny, const SfxItemSet& rSet ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::IllegalArgumentException - void setPropertyValue( const SfxItemPropertyMapEntry* pMap, const css::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ); + SAL_DLLPRIVATE void setPropertyValue( const SfxItemPropertyMapEntry* pMap, const css::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ); - SvxUnoTextRangeBase(const SvxItemPropertySet* _pSet); - SvxUnoTextRangeBase(const SvxEditSource* pSource, const SvxItemPropertySet* _pSet); - SvxUnoTextRangeBase(const SvxUnoTextRangeBase& rRange); - virtual ~SvxUnoTextRangeBase() noexcept; + SAL_DLLPRIVATE SvxUnoTextRangeBase(const SvxItemPropertySet* _pSet); + SAL_DLLPRIVATE SvxUnoTextRangeBase(const SvxEditSource* pSource, const SvxItemPropertySet* _pSet); + SAL_DLLPRIVATE SvxUnoTextRangeBase(const SvxUnoTextRangeBase& rRange); + SAL_DLLPRIVATE virtual ~SvxUnoTextRangeBase() noexcept; public: // Internal @@ -324,13 +324,13 @@ public: } void SetSelection( const ESelection& rSelection ) noexcept; - void CollapseToStart() noexcept; - void CollapseToEnd() noexcept; - bool IsCollapsed() noexcept; - bool GoLeft(sal_Int32 nCount, bool Expand) noexcept; - bool GoRight(sal_Int32 nCount, bool Expand) noexcept; - void GotoStart(bool Expand) noexcept; - void GotoEnd(bool Expand) noexcept; + SAL_DLLPRIVATE void CollapseToStart() noexcept; + SAL_DLLPRIVATE void CollapseToEnd() noexcept; + SAL_DLLPRIVATE bool IsCollapsed() noexcept; + SAL_DLLPRIVATE bool GoLeft(sal_Int32 nCount, bool Expand) noexcept; + SAL_DLLPRIVATE bool GoRight(sal_Int32 nCount, bool Expand) noexcept; + SAL_DLLPRIVATE void GotoStart(bool Expand) noexcept; + SAL_DLLPRIVATE void GotoEnd(bool Expand) noexcept; //const SfxItemPropertyMapEntry* getPropertyMapEntries() const throw() { return maPropSet.getPropertyMapEntries(); } const SvxItemPropertySet* getPropertySet() const noexcept { return mpPropSet; } @@ -345,10 +345,10 @@ public: UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextRangeBase ) // css::text::XTextRange - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override; - virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override; - virtual OUString SAL_CALL getString() override; - virtual void SAL_CALL setString( const OUString& aString ) override; + SAL_DLLPRIVATE virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() override; + SAL_DLLPRIVATE virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() override; + SAL_DLLPRIVATE virtual OUString SAL_CALL getString() override; + SAL_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) override; // css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; @@ -384,8 +384,8 @@ public: // css::lang::XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); + SAL_DLLPRIVATE virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + SAL_DLLPRIVATE static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); }; diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 96bce367fd75..b1d45b4c40e1 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -98,18 +98,18 @@ class SFX2_DLLPUBLIC SfxApplication final : public SfxShell DECL_DLLPRIVATE_STATIC_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, bool ); - void Deinitialize(); + SAL_DLLPRIVATE void Deinitialize(); public: SFX_DECL_INTERFACE(SFX_INTERFACE_SFXAPP) private: /// SfxInterface initializer. - static void InitInterface_Impl(); - SfxApplication(); + SAL_DLLPRIVATE static void InitInterface_Impl(); + SAL_DLLPRIVATE SfxApplication(); public: - virtual ~SfxApplication() override; + SAL_DLLPRIVATE virtual ~SfxApplication() override; static SfxApplication* GetOrCreate(); static SfxApplication* Get(); @@ -117,8 +117,8 @@ public: #if defined(_WIN32) static bool DdeExecute( const OUString& rCmd ); #endif - bool InitializeDde(); - const DdeService* GetDdeService() const; + SAL_DLLPRIVATE bool InitializeDde(); + SAL_DLLPRIVATE const DdeService* GetDdeService() const; DdeService* GetDdeService(); #if defined(_WIN32) void AddDdeTopic( SfxObjectShell* ); @@ -134,16 +134,16 @@ public: // members SfxFilterMatcher& GetFilterMatcher(); - SfxProgress* GetProgress() const; - sal_uInt16 GetFreeIndex(); - void ReleaseIndex(sal_uInt16 i); + SAL_DLLPRIVATE SfxProgress* GetProgress() const; + SAL_DLLPRIVATE sal_uInt16 GetFreeIndex(); + SAL_DLLPRIVATE void ReleaseIndex(sal_uInt16 i); // Basic/Scripting static bool IsXScriptURL( const OUString& rScriptURL ); static OUString ChooseScript(weld::Window *pParent); // if xDocFrame is present, then select that document in the macro organizer by default, otherwise it is typically "Application Macros" // that is preselected - static void MacroOrganizer(weld::Window* pParent, const css::uno::Reference<css::frame::XFrame>& xDocFrame, sal_Int16 nTabId); + SAL_DLLPRIVATE static void MacroOrganizer(weld::Window* pParent, const css::uno::Reference<css::frame::XFrame>& xDocFrame, sal_Int16 nTabId); static ErrCode CallBasic( const OUString&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); static ErrCode CallAppBasic( const OUString& i_macroName ) { return CallBasic( i_macroName, SfxApplication::GetBasicManager(), nullptr, nullptr ); } @@ -156,7 +156,7 @@ public: // misc. static void GetOptions(SfxItemSet &); static void SetOptions(const SfxItemSet &); - virtual void Invalidate(sal_uInt16 nId = 0) override; + SAL_DLLPRIVATE virtual void Invalidate(sal_uInt16 nId = 0) override; void NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true ); bool IsDowning() const; void ResetLastDir(); @@ -225,7 +225,7 @@ public: static bool IsTipOfTheDayDue(); /** this Theme contains Images so must be deleted before DeInitVCL */ - sfx2::sidebar::Theme & GetSidebarTheme(); + SAL_DLLPRIVATE sfx2::sidebar::Theme & GetSidebarTheme(); }; inline SfxApplication* SfxGetpApp() diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 5aea4ec82a6f..c8f2ddf19655 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -43,30 +43,30 @@ public: virtual ~SfxTemplateManagerDlg() override; virtual short run() override; - void setDocumentModel(const css::uno::Reference<css::frame::XModel>& rModel); - void setTemplateViewMode(TemplateViewMode eViewMode); - TemplateViewMode getTemplateViewMode() const; + SAL_DLLPRIVATE void setDocumentModel(const css::uno::Reference<css::frame::XModel>& rModel); + SAL_DLLPRIVATE void setTemplateViewMode(TemplateViewMode eViewMode); + SAL_DLLPRIVATE TemplateViewMode getTemplateViewMode() const; protected: - void getApplicationSpecificSettings(); + SAL_DLLPRIVATE void getApplicationSpecificSettings(); - void readSettings(); + SAL_DLLPRIVATE void readSettings(); - void writeSettings(); + SAL_DLLPRIVATE void writeSettings(); - void fillFolderComboBox(); + SAL_DLLPRIVATE void fillFolderComboBox(); DECL_DLLPRIVATE_LINK(SelectApplicationHdl, weld::ComboBox&, void); DECL_DLLPRIVATE_LINK(SelectRegionHdl, weld::ComboBox&, void); DECL_DLLPRIVATE_LINK(OkClickHdl, weld::Button&, void); - void ImportActionHdl(); - static void ExtensionsActionHdl(); + SAL_DLLPRIVATE void ImportActionHdl(); + SAL_DLLPRIVATE static void ExtensionsActionHdl(); DECL_DLLPRIVATE_LINK(TVItemStateHdl, const ThumbnailViewItem*, void); DECL_DLLPRIVATE_LINK(MenuSelectHdl, const OUString&, void); - void DefaultTemplateMenuSelectHdl(std::u16string_view rIdent); + SAL_DLLPRIVATE void DefaultTemplateMenuSelectHdl(std::u16string_view rIdent); DECL_DLLPRIVATE_LINK(OpenRegionHdl, void*, void); DECL_DLLPRIVATE_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); @@ -77,7 +77,7 @@ protected: DECL_DLLPRIVATE_LINK(MoveTemplateHdl, void*, void); DECL_DLLPRIVATE_LINK(ExportTemplateHdl, void*, void); - void SearchUpdate(); + SAL_DLLPRIVATE void SearchUpdate(); DECL_DLLPRIVATE_LINK(SearchUpdateHdl, weld::Entry&, void); DECL_DLLPRIVATE_LINK(GetFocusHdl, weld::Widget&, void); @@ -89,18 +89,18 @@ protected: DECL_DLLPRIVATE_LINK(ThumbnailViewHdl, weld::Toggleable&, void); DECL_DLLPRIVATE_LINK(FocusRectLocalHdl, weld::Widget&, tools::Rectangle); - void OnTemplateImportCategory(std::u16string_view sCategory); + SAL_DLLPRIVATE void OnTemplateImportCategory(std::u16string_view sCategory); // static void OnTemplateLink (); - void OnTemplateOpen(); - void OnTemplateExport(); + SAL_DLLPRIVATE void OnTemplateOpen(); + SAL_DLLPRIVATE void OnTemplateExport(); - void OnTemplateState(const ThumbnailViewItem* pItem); + SAL_DLLPRIVATE void OnTemplateState(const ThumbnailViewItem* pItem); - void OnCategoryNew(); - void OnCategoryRename(); - void OnCategoryDelete(); + SAL_DLLPRIVATE void OnCategoryNew(); + SAL_DLLPRIVATE void OnCategoryRename(); + SAL_DLLPRIVATE void OnCategoryDelete(); - void updateMenuItems(); + SAL_DLLPRIVATE void updateMenuItems(); /** * @@ -108,10 +108,10 @@ protected: * **/ - void localMoveTo(sal_uInt16 nMenuId); + SAL_DLLPRIVATE void localMoveTo(sal_uInt16 nMenuId); /// Return filter according to the currently selected application filter. - FILTER_APPLICATION getCurrentApplicationFilter() const; + SAL_DLLPRIVATE FILTER_APPLICATION getCurrentApplicationFilter() const; protected: std::set<const ThumbnailViewItem*, selection_cmp_fn> maSelTemplates; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 54e8440ad363..08babad793cb 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -178,16 +178,16 @@ public: void AppendItem(std::unique_ptr<ThumbnailViewItem> pItem); - void RemoveItem(sal_uInt16 nItemId); + SAL_DLLPRIVATE void RemoveItem(sal_uInt16 nItemId); virtual void Clear(); // Change current thumbnail item list with new one (invalidates all pointers to a thumbnail item) - void updateItems(std::vector<std::unique_ptr<ThumbnailViewItem>> items); + SAL_DLLPRIVATE void updateItems(std::vector<std::unique_ptr<ThumbnailViewItem>> items); - size_t GetItemPos( sal_uInt16 nItemId ) const; + SAL_DLLPRIVATE size_t GetItemPos( sal_uInt16 nItemId ) const; - sal_uInt16 GetItemId( size_t nPos ) const; + SAL_DLLPRIVATE sal_uInt16 GetItemId( size_t nPos ) const; sal_uInt16 GetItemId( const Point& rPos ) const; @@ -195,14 +195,14 @@ public: bool isDrawMnemonic() const { return mbDrawMnemonics; } - void setItemMaxTextLength (sal_uInt32 nLength); + SAL_DLLPRIVATE void setItemMaxTextLength (sal_uInt32 nLength); void setItemDimensions (tools::Long ItemWidth, tools::Long ThumbnailHeight, tools::Long DisplayHeight, int itemPadding); void SelectItem( sal_uInt16 nItemId ); - bool IsItemSelected( sal_uInt16 nItemId ) const; + SAL_DLLPRIVATE bool IsItemSelected( sal_uInt16 nItemId ) const; /** * @@ -212,11 +212,11 @@ public: void deselectItems (); - void ShowTooltips( bool bShowTooltips ); + SAL_DLLPRIVATE void ShowTooltips( bool bShowTooltips ); void DrawMnemonics( bool bDrawMnemonics ); - void filterItems (const std::function<bool (const ThumbnailViewItem*) > &func); + SAL_DLLPRIVATE void filterItems(const std::function<bool (const ThumbnailViewItem*) > &func); void setItemStateHdl (const Link<const ThumbnailViewItem*,void> &aLink) { maItemStateHdl = aLink; } @@ -254,36 +254,36 @@ protected: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - const rtl::Reference<ThumbnailViewAcc> & getAccessible() const; + SAL_DLLPRIVATE const rtl::Reference<ThumbnailViewAcc> & getAccessible() const; protected: // Drawing item related functions, override them to make your own custom ones. - void DrawItem (ThumbnailViewItem const *pItem); + SAL_DLLPRIVATE void DrawItem (ThumbnailViewItem const *pItem); virtual void OnItemDblClicked (ThumbnailViewItem *pItem); // Set Item colors from the ThumbnailView colors - void UpdateColors(); + SAL_DLLPRIVATE void UpdateColors(); protected: friend class ThumbnailViewAcc; friend class ThumbnailViewItemAcc; - void CalculateItemPositions (bool bScrollBarUsed = false); - void MakeItemVisible( sal_uInt16 nId ); + SAL_DLLPRIVATE void CalculateItemPositions (bool bScrollBarUsed = false); + SAL_DLLPRIVATE void MakeItemVisible( sal_uInt16 nId ); - void ImplInit(); + SAL_DLLPRIVATE void ImplInit(); - void ImplDeleteItems(); - size_t ImplGetItem( const Point& rPoint ) const; - ThumbnailViewItem* ImplGetItem( size_t nPos ); - sal_uInt16 ImplGetVisibleItemCount() const; - ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos); - void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); - bool ImplHasAccessibleListeners() const; + SAL_DLLPRIVATE void ImplDeleteItems(); + SAL_DLLPRIVATE size_t ImplGetItem( const Point& rPoint ) const; + SAL_DLLPRIVATE ThumbnailViewItem* ImplGetItem( size_t nPos ); + SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; + SAL_DLLPRIVATE ThumbnailViewItem* ImplGetVisibleItem(sal_uInt16 nVisiblePos); + SAL_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); + SAL_DLLPRIVATE bool ImplHasAccessibleListeners() const; DECL_DLLPRIVATE_LINK( ImplScrollHdl, weld::ScrolledWindow&, void ); protected: diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 1e3d4e55ab47..3d0bf2fcc08a 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC SfxViewFrame final : public SfxShell, public SfxListener std::unique_ptr<CommandPopupHandler> m_pCommandPopupHandler; SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; + SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; DECL_DLLPRIVATE_LINK(GetInvolvedHandler, weld::Button&, void); DECL_DLLPRIVATE_LINK(DonationHandler, weld::Button&, void); DECL_DLLPRIVATE_LINK(MacroButtonHandler, weld::Button&, void); @@ -74,21 +74,21 @@ class SFX2_DLLPUBLIC SfxViewFrame final : public SfxShell, public SfxListener DECL_DLLPRIVATE_STATIC_LINK(SfxViewFrame, HelpMasterPasswordHdl, weld::Button&, void); SAL_DLLPRIVATE void KillDispatcher_Impl(); - virtual ~SfxViewFrame() override; + SAL_DLLPRIVATE virtual ~SfxViewFrame() override; public: - SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc ); + SAL_DLLPRIVATE SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc ); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM) private: /// SfxInterface initializer. - static void InitInterface_Impl(); + SAL_DLLPRIVATE static void InitInterface_Impl(); - void AppendContainsMacrosInfobar(); + SAL_DLLPRIVATE void AppendContainsMacrosInfobar(); public: - static void SetViewFrame( SfxViewFrame* ); + SAL_DLLPRIVATE static void SetViewFrame( SfxViewFrame* ); static SfxViewFrame* LoadHiddenDocument( SfxObjectShell const & i_rDoc, SfxInterfaceId i_nViewId ); static SfxViewFrame* LoadDocument( SfxObjectShell const & i_rDoc, SfxInterfaceId i_nViewId ); @@ -100,10 +100,10 @@ public: SAL_WARN_UNUSED_RESULT static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = nullptr, bool bOnlyVisible = true ); SAL_WARN_UNUSED_RESULT static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = nullptr, bool bOnlyVisible = true ); - SAL_WARN_UNUSED_RESULT static SfxViewFrame* Get( const css::uno::Reference< css::frame::XController>& i_rController, const SfxObjectShell* i_pDoc ); + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE static SfxViewFrame* Get( const css::uno::Reference< css::frame::XController>& i_rController, const SfxObjectShell* i_pDoc ); - void DoActivate(bool bMDI); - void DoDeactivate(bool bMDI, SfxViewFrame const *pOld); + SAL_DLLPRIVATE void DoActivate(bool bMDI); + SAL_DLLPRIVATE void DoDeactivate(bool bMDI, SfxViewFrame const *pOld); using SfxShell::GetDispatcher; SfxDispatcher* GetDispatcher() { return m_pDispatcher.get(); } @@ -112,24 +112,24 @@ public: vcl::Window& GetWindow() const; weld::Window* GetFrameWeld() const; - SfxProgress* GetProgress() const; + SAL_DLLPRIVATE SfxProgress* GetProgress() const; void LockAdjustPosSizePixel() { m_nAdjustPosPixelLock++; } void UnlockAdjustPosSizePixel() { m_nAdjustPosPixelLock--; } - void DoAdjustPosSizePixel( SfxViewShell * pSh, + SAL_DLLPRIVATE void DoAdjustPosSizePixel( SfxViewShell * pSh, const Point &rPos, const Size &rSize, bool inplaceEditModeChange ); void Show(); bool IsVisible() const; void ToTop(); void Enable( bool bEnable ); - void Close(); - virtual void Activate( bool bUI ) override; - virtual void Deactivate( bool bUI ) override; + SAL_DLLPRIVATE void Close(); + SAL_DLLPRIVATE virtual void Activate( bool bUI ) override; + SAL_DLLPRIVATE virtual void Deactivate( bool bUI ) override; - void UpdateTitle(); + SAL_DLLPRIVATE void UpdateTitle(); // interne Handler SAL_DLLPRIVATE void SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder ); @@ -145,7 +145,7 @@ public: static void GetTargetList( TargetList& rList ) { SfxFrame::GetDefaultTargetList( rList ); } - void SetModalMode( bool ); + SAL_DLLPRIVATE void SetModalMode( bool ); bool IsInModalMode() const; void Resize(bool bForce=false); @@ -156,7 +156,7 @@ public: void ShowChildWindow(sal_uInt16,bool bVisible=true); SfxChildWindow* GetChildWindow(sal_uInt16); void ChildWindowExecute(SfxRequest&); - void ChildWindowState(SfxItemSet&); + SAL_DLLPRIVATE void ChildWindowState(SfxItemSet&); /** Append a new InfoBar (see https://wiki.documentfoundation.org/Design/Whiteboards/Infobar). @@ -169,12 +169,12 @@ public: InfobarType aInfobarType, bool bShowCloseButton=true); void RemoveInfoBar(std::u16string_view sId); - void UpdateInfoBar(std::u16string_view sId, const OUString& sPrimaryMessage, + SAL_DLLPRIVATE void UpdateInfoBar(std::u16string_view sId, const OUString& sPrimaryMessage, const OUString& sSecondaryMessage, InfobarType eType); bool HasInfoBarWithID(std::u16string_view sId); void AppendReadOnlyInfobar(); - void HandleSecurityInfobar(const OUString& sSecondaryMessage); + SAL_DLLPRIVATE void HandleSecurityInfobar(const OUString& sSecondaryMessage); SAL_DLLPRIVATE void GetDocNumber_Impl(); SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh ); diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index eca3f4abd4a6..0e8b9ddb1f73 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -329,19 +329,19 @@ protected: virtual void EmptyActionsChanged(); private: - size_t ImplLeaveListAction( const bool i_merge, ::svl::undo::impl::UndoManagerGuard& i_guard ); - bool ImplAddUndoAction_NoNotify( std::unique_ptr<SfxUndoAction> pAction, bool bTryMerge, bool bClearRedo, ::svl::undo::impl::UndoManagerGuard& i_guard ); - void ImplClearRedo( ::svl::undo::impl::UndoManagerGuard& i_guard, bool const i_currentLevel ); - void ImplClearUndo( ::svl::undo::impl::UndoManagerGuard& i_guard ); - void ImplClearCurrentLevel_NoNotify( ::svl::undo::impl::UndoManagerGuard& i_guard ); - size_t ImplGetRedoActionCount_Lock( bool const i_currentLevel = CurrentLevel ) const; - bool ImplIsUndoEnabled_Lock() const; - bool ImplIsInListAction_Lock() const; - void ImplEnableUndo_Lock( bool const i_enable ); - - bool ImplUndo( SfxUndoContext* i_contextOrNull ); - bool ImplRedo( SfxUndoContext* i_contextOrNull ); - void ImplCheckEmptyActions(); + SAL_DLLPRIVATE size_t ImplLeaveListAction( const bool i_merge, ::svl::undo::impl::UndoManagerGuard& i_guard ); + SAL_DLLPRIVATE bool ImplAddUndoAction_NoNotify( std::unique_ptr<SfxUndoAction> pAction, bool bTryMerge, bool bClearRedo, ::svl::undo::impl::UndoManagerGuard& i_guard ); + SAL_DLLPRIVATE void ImplClearRedo( ::svl::undo::impl::UndoManagerGuard& i_guard, bool const i_currentLevel ); + SAL_DLLPRIVATE void ImplClearUndo( ::svl::undo::impl::UndoManagerGuard& i_guard ); + SAL_DLLPRIVATE void ImplClearCurrentLevel_NoNotify( ::svl::undo::impl::UndoManagerGuard& i_guard ); + SAL_DLLPRIVATE size_t ImplGetRedoActionCount_Lock( bool const i_currentLevel = CurrentLevel ) const; + SAL_DLLPRIVATE bool ImplIsUndoEnabled_Lock() const; + SAL_DLLPRIVATE bool ImplIsInListAction_Lock() const; + SAL_DLLPRIVATE void ImplEnableUndo_Lock( bool const i_enable ); + + SAL_DLLPRIVATE bool ImplUndo( SfxUndoContext* i_contextOrNull ); + SAL_DLLPRIVATE bool ImplRedo( SfxUndoContext* i_contextOrNull ); + SAL_DLLPRIVATE void ImplCheckEmptyActions(); inline bool ImplIsEmptyActions() const; friend class ::svl::undo::impl::LockGuard; diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 42155eb1f45e..1452ee111bb0 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -375,16 +375,16 @@ private: bool GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowColMove = false); void SelectColumnPos( sal_uInt16 nCol, bool _bSelect, bool bMakeVisible); - void ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice); + SAL_DLLPRIVATE void ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice); bool PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); } - sal_uInt16 ToggleSelectedColumn(); - void SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId); + SAL_DLLPRIVATE sal_uInt16 ToggleSelectedColumn(); + SAL_DLLPRIVATE void SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId); protected: /// retrieves the XAccessible implementation associated with the BrowseBox instance - ::vcl::IAccessibleFactory& getAccessibleFactory(); + SAL_DLLPRIVATE ::vcl::IAccessibleFactory& getAccessibleFactory(); protected: bool m_bNavigationBar; @@ -410,8 +410,8 @@ protected: nRow starts at 0 */ virtual bool SeekRow( sal_Int32 nRow ) = 0; - void DrawCursor(); - void PaintData(vcl::Window const & rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); + SAL_DLLPRIVATE void DrawCursor(); + SAL_DLLPRIVATE void PaintData(vcl::Window const & rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0; // Advice for the subclass: the visible scope of rows has changed. // The subclass is able to announce changes of the model with the @@ -435,9 +435,9 @@ protected: sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } // Focus-Rect enable / disable - void DoShowCursor(); - void DoHideCursor(); - short GetCursorHideCount() const; + SAL_DLLPRIVATE void DoShowCursor(); + SAL_DLLPRIVATE void DoHideCursor(); + SAL_DLLPRIVATE short GetCursorHideCount() const; virtual VclPtr<BrowserHeader> CreateHeaderBar( BrowseBox* pParent ); @@ -459,7 +459,7 @@ protected: virtual void ImplEndTracking(); public: - BrowseBox( vcl::Window* pParent, WinBits nBits, + SAL_DLLPRIVATE BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode = BrowserMode::NONE ); virtual ~BrowseBox() override; virtual void dispose() override; @@ -487,7 +487,7 @@ public: // new handlers virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); virtual void MouseButtonUp( const BrowserMouseEvent& rEvt ); - void StartScroll(); + SAL_DLLPRIVATE void StartScroll(); virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); @@ -533,11 +533,11 @@ public: tools::Long GetColumnWidth( sal_uInt16 nColumnId ) const; sal_uInt16 GetColumnId( sal_uInt16 nPos ) const; sal_uInt16 GetColumnPos( sal_uInt16 nColumnId ) const; - bool IsFrozen( sal_uInt16 nColumnId ) const; + SAL_DLLPRIVATE bool IsFrozen( sal_uInt16 nColumnId ) const; // movement of visible area - sal_Int32 ScrollColumns( sal_Int32 nColumns ); - sal_Int32 ScrollRows( sal_Int32 nRows ); + SAL_DLLPRIVATE sal_Int32 ScrollColumns( sal_Int32 nColumns ); + SAL_DLLPRIVATE sal_Int32 ScrollRows( sal_Int32 nRows ); void MakeFieldVisible( sal_Int32 nRow, sal_uInt16 nColId ); // access and movement of cursor @@ -575,14 +575,14 @@ public: tools::Rectangle GetRowRectPixel( sal_Int32 nRow ) const; tools::Rectangle GetFieldRectPixel( sal_Int32 nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const; - bool IsFieldVisible( sal_Int32 nRow, sal_uInt16 nColId, + SAL_DLLPRIVATE bool IsFieldVisible( sal_Int32 nRow, sal_uInt16 nColId, bool bComplete = false ) const; sal_Int32 GetRowAtYPosPixel( tools::Long nY, bool bRelToBrowser = true ) const; sal_uInt16 GetColumnAtXPosPixel( tools::Long nX ) const; // invalidations - void Clear(); + SAL_DLLPRIVATE void Clear(); void RowRemoved( sal_Int32 nRow, sal_Int32 nNumRows = 1, bool bDoPaint = true ); void RowModified( sal_Int32 nRow, sal_uInt16 nColId = BROWSER_INVALIDID ); void RowInserted( sal_Int32 nRow, sal_Int32 nNumRows = 1, bool bDoPaint = true, bool bKeepSelection = false ); @@ -593,7 +593,7 @@ public: virtual bool ProcessKey(const KeyEvent& rEvt); virtual void ChildFocusIn(); virtual void ChildFocusOut(); - void Dispatch( sal_uInt16 nId ); + SAL_DLLPRIVATE void Dispatch( sal_uInt16 nId ); void SetMode( BrowserMode nMode ); BrowserMode GetMode( ) const { return m_nCurrentMode; } @@ -644,7 +644,7 @@ public: @param rOldValue the old value */ - void commitBrowseBoxEvent(sal_Int16 nEventId, + SAL_DLLPRIVATE void commitBrowseBoxEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue); @@ -656,7 +656,7 @@ public: @param rOldValue the old value */ - void commitTableEvent(sal_Int16 nEventId, + SAL_DLLPRIVATE void commitTableEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue); @@ -669,7 +669,7 @@ public: @param rOldValue the old value */ - void commitHeaderBarEvent(sal_Int16 nEventId, + SAL_DLLPRIVATE void commitHeaderBarEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue, bool _bColumnHeaderBar @@ -706,7 +706,7 @@ public: virtual tools::Rectangle GetFieldRectPixel(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen) override; /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive - bool isAccessibleAlive( ) const; + SAL_DLLPRIVATE bool isAccessibleAlive( ) const; public: /** Creates and returns the accessible object of the whole BrowseBox. */ diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index ffdce3797769..fa8ee330e13e 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -156,8 +156,8 @@ private: Point aFocusPosition; rtl::Reference<SvxPixelCtlAccessible> m_xAccess; - tools::Rectangle implCalFocusRect( const Point& aPosition ); - void ChangePixel( sal_uInt16 nPixel ); + SAL_DLLPRIVATE tools::Rectangle implCalFocusRect( const Point& aPosition ); + SAL_DLLPRIVATE void ChangePixel( sal_uInt16 nPixel ); SvxPixelCtl(SvxPixelCtl const&) = delete; SvxPixelCtl(SvxPixelCtl&&) = delete; @@ -169,11 +169,11 @@ public: virtual ~SvxPixelCtl() override; - virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; - virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; - virtual void Resize() override; - virtual tools::Rectangle GetFocusRect() override; + SAL_DLLPRIVATE virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; + SAL_DLLPRIVATE virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; + SAL_DLLPRIVATE virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override; + SAL_DLLPRIVATE virtual void Resize() override; + SAL_DLLPRIVATE virtual tools::Rectangle GetFocusRect() override; void SetXBitmap( const BitmapEx& rBitmapEx ); @@ -182,14 +182,14 @@ public: static sal_uInt16 GetLineCount() { return nLines; } - sal_uInt8 GetBitmapPixel( const sal_uInt16 nPixelNumber ) const; + SAL_DLLPRIVATE sal_uInt8 GetBitmapPixel( const sal_uInt16 nPixelNumber ) const; std::array<sal_uInt8,64> const & GetBitmapPixelPtr() const { return maPixelData; } void SetPaintable( bool bTmp ) { bPaintable = bTmp; } void Reset(); css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); } - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; + SAL_DLLPRIVATE virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override; a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); } static tools::Long GetSquares() { return nSquares ; } @@ -197,15 +197,15 @@ public: tools::Long GetHeight() const { return aRectSize.getHeight() ; } //Device Pixel . - tools::Long ShowPosition( const Point &pt); + SAL_DLLPRIVATE tools::Long ShowPosition( const Point &pt); - tools::Long PointToIndex(const Point &pt) const; - Point IndexToPoint(tools::Long nIndex) const ; - tools::Long GetFocusPosIndex() const ; + SAL_DLLPRIVATE tools::Long PointToIndex(const Point &pt) const; + SAL_DLLPRIVATE Point IndexToPoint(tools::Long nIndex) const ; + SAL_DLLPRIVATE tools::Long GetFocusPosIndex() const ; //Keyboard function for key input and focus handling function - virtual bool KeyInput( const KeyEvent& rKEvt ) override; - virtual void GetFocus() override; - virtual void LoseFocus() override; + SAL_DLLPRIVATE virtual bool KeyInput( const KeyEvent& rKEvt ) override; + SAL_DLLPRIVATE virtual void GetFocus() override; + SAL_DLLPRIVATE virtual void LoseFocus() override; }; /************************************************************************/ diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index 10c8f4da2d1c..1ddb9b76cbd0 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -80,7 +80,7 @@ public: sal_Int32 GetRowCount() const; /** Returns the number of cells in the array. */ - sal_Int32 GetCellCount() const; + SAL_DLLPRIVATE sal_Int32 GetCellCount() const; /** Returns the cell index from the cell address (nCol,nRow). */ sal_Int32 GetCellIndex( sal_Int32 nCol, sal_Int32 nRow, bool bRTL) const; @@ -131,40 +131,40 @@ public: Returns the style only if visible (i.e. at left border of a merged range). @return The left frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleLeft( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleLeft( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the right frame style of the cell (nCol,nRow). Returns thicker of own right style or left style of the cell to the right. Returns the style only if visible (i.e. at right border of a merged range). @return The left frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleRight( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleRight( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the top frame style of the cell (nCol,nRow). Returns thicker of own top style or bottom style of the cell above. Returns the style only if visible (i.e. at top border of a merged range). @return The top frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleTop( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleTop( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the top frame style of the cell (nCol,nRow). Returns thicker of own top style or bottom style of the cell above. Returns the style only if visible (i.e. at top border of a merged range). @return The top frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleBottom( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleBottom( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the top-left to bottom-right frame style of the cell (nCol,nRow). Ignores merged ranges; @return The top-left to bottom-right frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleTLBR( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleTLBR( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the bottom-left to top-right frame style of the cell (nCol,nRow). Ignores merged ranges; @return The bottom-left to top-right frame style or an invisible style for invalid cell addresses. */ - const Style& GetCellStyleBLTR( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleBLTR( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the top-left to bottom-right frame style of the cell (nCol,nRow). @return @@ -172,7 +172,7 @@ public: a merged range, or if (nCol,nRow) is the top-left corner of a merged range (useful to find connected frame styles). An invisible style for invalid cell addresses. */ - const Style& GetCellStyleTL( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleTL( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the top-left to bottom-right frame style of the cell (nCol,nRow). @return @@ -180,7 +180,7 @@ public: a merged range, or if (nCol,nRow) is the bottom-right corner of a merged range (useful to find connected frame styles). An invisible style for invalid cell addresses. */ - const Style& GetCellStyleBR( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleBR( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the bottom-left to top-right frame style of the cell (nCol,nRow). @return @@ -188,7 +188,7 @@ public: a merged range, or if (nCol,nRow) is the bottom-left corner of a merged range (useful to find connected frame styles). An invisible style for invalid cell addresses. */ - const Style& GetCellStyleBL( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleBL( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the bottom-left to top-right frame style of the cell (nCol,nRow). @return @@ -196,7 +196,7 @@ public: a merged range, or if (nCol,nRow) is the top-right corner of a merged range (useful to find connected frame styles). An invisible style for invalid cell addresses. */ - const Style& GetCellStyleTR( sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE const Style& GetCellStyleTR( sal_Int32 nCol, sal_Int32 nRow ) const; // cell merging @@ -228,10 +228,10 @@ public: bool IsMerged( sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the address of the top-left cell of the merged range that contains (nCol,nRow). */ - void GetMergedOrigin( sal_Int32& rnFirstCol, sal_Int32& rnFirstRow, sal_Int32 nCol, sal_Int32 nRow ) const; + SAL_DLLPRIVATE void GetMergedOrigin( sal_Int32& rnFirstCol, sal_Int32& rnFirstRow, sal_Int32 nCol, sal_Int32 nRow ) const; /** Returns the top-left and bottom-right address of the merged range that contains (nCol,nRow). */ - void GetMergedRange( sal_Int32& rnFirstCol, sal_Int32& rnFirstRow, + SAL_DLLPRIVATE void GetMergedRange( sal_Int32& rnFirstCol, sal_Int32& rnFirstRow, sal_Int32& rnLastCol, sal_Int32& rnLastRow, sal_Int32 nCol, sal_Int32 nRow ) const; // clipping @@ -270,18 +270,18 @@ public: /** Returns the X output coordinate of the left border of the specified column. @descr The column index <array-width> returns the X output coordinate of the right array border. */ - sal_Int32 GetColPosition( sal_Int32 nCol ) const; + SAL_DLLPRIVATE sal_Int32 GetColPosition( sal_Int32 nCol ) const; /** Returns the Y output coordinate of the top border of the specified row. @descr The row index <array-height> returns the Y output coordinate of the bottom array border. */ - sal_Int32 GetRowPosition( sal_Int32 nRow ) const; + SAL_DLLPRIVATE sal_Int32 GetRowPosition( sal_Int32 nRow ) const; /** Returns the output width of the specified range of columns. */ - sal_Int32 GetColWidth( sal_Int32 nFirstCol, sal_Int32 nLastCol ) const; + SAL_DLLPRIVATE sal_Int32 GetColWidth( sal_Int32 nFirstCol, sal_Int32 nLastCol ) const; /** Returns the output height of the specified range of rows. */ - sal_Int32 GetRowHeight( sal_Int32 nFirstRow, sal_Int32 nLastRow ) const; + SAL_DLLPRIVATE sal_Int32 GetRowHeight( sal_Int32 nFirstRow, sal_Int32 nLastRow ) const; /** Returns the output width of the entire array. */ sal_Int32 GetWidth() const; @@ -294,7 +294,7 @@ public: basegfx::B2DRange GetCellRange( sal_Int32 nCol, sal_Int32 nRow ) const; // return output range of given row/col range in logical coordinates - basegfx::B2DRange GetB2DRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ) const; + SAL_DLLPRIVATE basegfx::B2DRange GetB2DRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ) const; // mirroring diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 410fa593ac92..21236c261fa8 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -41,23 +41,23 @@ namespace sdr::properties mutable std::optional<SfxItemSet> moItemSet; // create a new object specific itemset with object specific ranges. - virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& pPool) override; + SAL_DLLPRIVATE virtual SfxItemSet CreateObjectSpecificItemSet(SfxItemPool& pPool) override; // Test changeability for a single item. If an implementation wants to prevent // changing an item it should override this method. - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const; + SAL_DLLPRIVATE virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const; // Do the internal ItemChange. If only nWhich is given, the item needs to be cleared. // Also needs to handle if nWhich and pNewItem is 0, which means to clear all items. - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr); + SAL_DLLPRIVATE virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr); // Called after ItemChange() is done for all items. Allows local reactions on // specific item changes - virtual void PostItemChange(const sal_uInt16 nWhich); + SAL_DLLPRIVATE virtual void PostItemChange(const sal_uInt16 nWhich); // Internally react on ItemSet changes. The given span contains changed items. // If nDeletedWhich is not 0, it indicates a deleted item. - virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich); + SAL_DLLPRIVATE virtual void ItemSetChanged(std::span< const SfxPoolItem* const > aChangedItems, sal_uInt16 nDeletedWhich); // check if SfxItemSet exists bool HasSfxItemSet() const { return bool(moItemSet); } @@ -67,46 +67,46 @@ namespace sdr::properties explicit DefaultProperties(SdrObject& rObj); // constructor for copying, but using new object - DefaultProperties(const DefaultProperties& rProps, SdrObject& rObj); + SAL_DLLPRIVATE DefaultProperties(const DefaultProperties& rProps, SdrObject& rObj); // destructor - virtual ~DefaultProperties() override; + SAL_DLLPRIVATE virtual ~DefaultProperties() override; - void dumpAsXml(xmlTextWriterPtr pWriter) const override; + SAL_DLLPRIVATE void dumpAsXml(xmlTextWriterPtr pWriter) const override; // Clone() operator, normally just calls the local copy constructor - virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override; + SAL_DLLPRIVATE virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const override; + SAL_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() const override; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem) override; + SAL_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem) override; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem) override; + SAL_DLLPRIVATE virtual void SetObjectItemDirect(const SfxPoolItem& rItem) override; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override; + SAL_DLLPRIVATE virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override; // clear single item direct, do not do any notifies or things like that. // Also supports complete deletion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich) override; + SAL_DLLPRIVATE virtual void ClearObjectItemDirect(const sal_uInt16 nWhich) override; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet) override; + SAL_DLLPRIVATE virtual void SetObjectItemSet(const SfxItemSet& rSet) override; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr, + SAL_DLLPRIVATE virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr, bool bBroadcast) override; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const override; + SAL_DLLPRIVATE virtual SfxStyleSheet* GetStyleSheet() const override; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created. // Default implementation does nothing. - virtual void ForceDefaultAttributes(); + SAL_DLLPRIVATE virtual void ForceDefaultAttributes(); }; } // end of namespace sdr::properties diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index 36aea7a11a6b..74e95141c710 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -77,9 +77,9 @@ private: ImplType mpImplPolygon; public: - static void ImplReduceEdges( tools::Polygon& rPoly, const double& rArea, sal_uInt16 nPercent ); - void ImplRead( SvStream& rIStream ); - void ImplWrite( SvStream& rOStream ) const; + SAL_DLLPRIVATE static void ImplReduceEdges( tools::Polygon& rPoly, const double& rArea, sal_uInt16 nPercent ); + SAL_DLLPRIVATE void ImplRead( SvStream& rIStream ); + SAL_DLLPRIVATE void ImplWrite( SvStream& rOStream ) const; public: Polygon(); @@ -110,13 +110,13 @@ public: PolyFlags GetFlags( sal_uInt16 nPos ) const; bool HasFlags() const; - bool IsRect() const; + SAL_DLLPRIVATE bool IsRect() const; void SetSize( sal_uInt16 nNewSize ); sal_uInt16 GetSize() const; sal_uInt16 size() const { return GetSize(); } //for vector compatibility - void Clear(); + SAL_DLLPRIVATE void Clear(); tools::Rectangle GetBoundRect() const; bool Contains( const Point& rPt ) const; diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 5c5e170aed02..d22e5fc7a482 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -96,28 +96,28 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper sal_uInt16 nCurrNegativeFormat; sal_uInt16 nCurrDigits; - void loadData(); - void loadDateAcceptancePatterns(const std::vector<OUString> & rOverrideDateAcceptancePatterns); + SAL_DLLPRIVATE void loadData(); + SAL_DLLPRIVATE void loadDateAcceptancePatterns(const std::vector<OUString> & rOverrideDateAcceptancePatterns); const OUString& getOneLocaleItem( sal_Int16 nItem ) const; const OUString& getOneReservedWord( sal_Int16 nWord ) const; - void loadCurrencyFormats(); + SAL_DLLPRIVATE void loadCurrencyFormats(); - void scanCurrFormatImpl( std::u16string_view rCode, + SAL_DLLPRIVATE void scanCurrFormatImpl( std::u16string_view rCode, sal_Int32 nStart, sal_Int32& nSign, sal_Int32& nPar, sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym ) const; - void loadDateOrders(); - LongDateOrder scanDateOrderImpl( std::u16string_view rCode ) const; + SAL_DLLPRIVATE void loadDateOrders(); + SAL_DLLPRIVATE LongDateOrder scanDateOrderImpl( std::u16string_view rCode ) const; - void ImplAddFormatNum( rtl::OUStringBuffer& rBuf, + SAL_DLLPRIVATE void ImplAddFormatNum( rtl::OUStringBuffer& rBuf, sal_Int64 nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const; - void loadDigitGrouping(); + SAL_DLLPRIVATE void loadDigitGrouping(); public: LocaleDataWrapper( @@ -151,7 +151,7 @@ public: // Wrapper implementations of service LocaleData - css::i18n::LanguageCountryInfo getLanguageCountryInfo() const; + SAL_DLLPRIVATE css::i18n::LanguageCountryInfo getLanguageCountryInfo() const; /// NOTE: this wraps XLocaleData5::getLocaleItem2() in fact. const css::i18n::LocaleDataItem2& getLocaleItem() const; /// NOTE: this wraps XLocaleData3::getAllCalendars2() in fact. @@ -160,7 +160,7 @@ public: css::uno::Sequence< css::i18n::Currency2 > getAllCurrencies() const; css::uno::Sequence< css::i18n::FormatElement > getAllFormats() const; css::i18n::ForbiddenCharacters getForbiddenCharacters() const; - const css::uno::Sequence< css::lang::Locale > & getAllInstalledLocaleNames() const; + SAL_DLLPRIVATE const css::uno::Sequence< css::lang::Locale > & getAllInstalledLocaleNames() const; const css::uno::Sequence< OUString > & getDateAcceptancePatterns() const; @@ -388,7 +388,7 @@ public: private: - const css::lang::Locale & getMyLocale() const; + SAL_DLLPRIVATE const css::lang::Locale & getMyLocale() const; static void evaluateLocaleDataChecking(); }; diff --git a/include/vcl/test/GraphicsRenderTests.hxx b/include/vcl/test/GraphicsRenderTests.hxx index 225a25cc6b66..d8242b953039 100644 --- a/include/vcl/test/GraphicsRenderTests.hxx +++ b/include/vcl/test/GraphicsRenderTests.hxx @@ -36,7 +36,7 @@ public: const Bitmap& getBitmap() const { return m_aResultantBitmap; } }; -class VCL_PLUGIN_PUBLIC GraphicsRenderTests +class SAL_DLLPUBLIC_RTTI GraphicsRenderTests { bool m_aStoreResultantBitmap; @@ -158,9 +158,9 @@ class VCL_PLUGIN_PUBLIC GraphicsRenderTests const Bitmap& rTestBitmap = Bitmap()); public: - std::vector<VclTestResult>& getTestResults(); - OUString getResultString(bool bLocalize = false); - void run(bool storeResultBitmap = false); + VCL_PLUGIN_PUBLIC std::vector<VclTestResult>& getTestResults(); + VCL_PLUGIN_PUBLIC OUString getResultString(bool bLocalize = false); + VCL_PLUGIN_PUBLIC void run(bool storeResultBitmap = false); GraphicsRenderTests() : m_aStoreResultantBitmap(false) diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index ead78c715dc9..e6bc704f3326 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -263,10 +263,10 @@ public: virtual void dispose() override; virtual void Click(); - void DoubleClick(); + SAL_DLLPRIVATE void DoubleClick(); virtual void Activate() override; virtual void Deactivate() override; - void Highlight(); + SAL_DLLPRIVATE void Highlight(); virtual void Select(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; @@ -317,7 +317,7 @@ public: void InsertSeparator( ImplToolItems::size_type nPos = APPEND, sal_uInt16 nPixSize = 0 ); void InsertBreak( ImplToolItems::size_type nPos = APPEND ); void RemoveItem( ImplToolItems::size_type nPos ); - void CopyItem( const ToolBox& rToolBox, ToolBoxItemId nItemId ); + SAL_DLLPRIVATE void CopyItem( const ToolBox& rToolBox, ToolBoxItemId nItemId ); void Clear(); void SetButtonType( ButtonType eNewType ); @@ -333,19 +333,19 @@ public: bool IsHorizontal() const { return mbHorz; } void SetLineCount( ImplToolItems::size_type nNewLines ); - void ShowLine( bool bNext ); + SAL_DLLPRIVATE void ShowLine( bool bNext ); ImplToolItems::size_type GetItemCount() const; ToolBoxItemType GetItemType( ImplToolItems::size_type nPos ) const; ImplToolItems::size_type GetItemPos( ToolBoxItemId nItemId ) const; ImplToolItems::size_type GetItemPos( const Point& rPos ) const; ToolBoxItemId GetItemId( ImplToolItems::size_type nPos ) const; - ToolBoxItemId GetItemId( const Point& rPos ) const; + SAL_DLLPRIVATE ToolBoxItemId GetItemId( const Point& rPos ) const; /// Map the command name (like .uno:Save) back to item id. ToolBoxItemId GetItemId( const OUString& rCommand ) const; tools::Rectangle GetItemRect( ToolBoxItemId nItemId ); tools::Rectangle GetItemPosRect( ImplToolItems::size_type nPos ); - tools::Rectangle const & GetOverflowRect() const; + SAL_DLLPRIVATE tools::Rectangle const & GetOverflowRect() const; /// Returns size of the bitmap / text that is inside this toolbox item. Size GetItemContentSize( ToolBoxItemId nItemId ); @@ -357,7 +357,7 @@ public: void SetItemBits( ToolBoxItemId nItemId, ToolBoxItemBits nBits ); ToolBoxItemBits GetItemBits( ToolBoxItemId nItemId ) const; - void SetItemExpand( ToolBoxItemId nItemId, bool bExpand ); + SAL_DLLPRIVATE void SetItemExpand( ToolBoxItemId nItemId, bool bExpand ); // e.g. a label used as an itemwindow void SetItemWindowNonInteractive(ToolBoxItemId nItemId, bool bNonInteractive); @@ -365,7 +365,7 @@ public: void SetItemData( ToolBoxItemId nItemId, void* pNewData ); void* GetItemData( ToolBoxItemId nItemId ) const; void SetItemImage( ToolBoxItemId nItemId, const Image& rImage ); - Image GetItemImage( ToolBoxItemId nItemId ) const; + SAL_DLLPRIVATE Image GetItemImage( ToolBoxItemId nItemId ) const; void SetItemImageAngle( ToolBoxItemId nItemId, Degree10 nAngle10 ); void SetItemImageMirrorMode( ToolBoxItemId nItemId, bool bMirror ); void SetItemText( ToolBoxItemId nItemId, const OUString& rText ); @@ -413,7 +413,7 @@ public: void SetHelpId( ToolBoxItemId nItemId, const OUString& rHelpId ); using DockingWindow::SetAccessibleName; - void SetAccessibleName(ToolBoxItemId nItemId, const OUString& rName ); + SAL_DLLPRIVATE void SetAccessibleName(ToolBoxItemId nItemId, const OUString& rName ); OUString GetAccessibleName(ToolBoxItemId nItemId) const; // window size according to current alignment, floating state and number of lines @@ -438,7 +438,7 @@ public: WinBits GetStyle() const { return mnWinStyle; } // enable/disable undocking - void Lock( bool bLock ); + SAL_DLLPRIVATE void Lock( bool bLock ); // read configuration to determine locking behaviour static bool AlwaysLocked(); @@ -469,13 +469,13 @@ public: // when the menu button was clicked and before the menu is executed void SetMenuType( ToolBoxMenuType aType = ToolBoxMenuType::Customize ); ToolBoxMenuType GetMenuType() const; - bool IsMenuEnabled() const; + SAL_DLLPRIVATE bool IsMenuEnabled() const; PopupMenu* GetMenu() const; - void UpdateCustomMenu(); + SAL_DLLPRIVATE void UpdateCustomMenu(); void SetMenuExecuteHdl( const Link<ToolBox *, void>& rLink ); // open custommenu - void ExecuteCustomMenu( const tools::Rectangle& rRect = tools::Rectangle() ); + SAL_DLLPRIVATE void ExecuteCustomMenu( const tools::Rectangle& rRect = tools::Rectangle() ); // allow Click Handler to distinguish between mouse and key input bool IsKeyEvent() const { return mbIsKeyEvent; } @@ -496,7 +496,7 @@ public: // if an index is found the corresponding item id is filled in (else 0) tools::Long GetIndexForPoint( const Point& rPoint, ToolBoxItemId& rItemID ); - static Size GetDefaultImageSize(ToolBoxButtonSize eToolBoxButtonSize); + static Size GetDefaultImageSize(ToolBoxButtonSize eToolBoxButtonSize); Size GetDefaultImageSize() const; void ChangeHighlight( ImplToolItems::size_type nPos ); |