diff options
61 files changed, 920 insertions, 1521 deletions
diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index 36d0af459a9c..659ca5be7453 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -1,38 +1,5 @@ -AllSettings::CopyData() -AllSettings::Update(AllSettingsFlags, AllSettings const&) -AllSettings::operator!=(AllSettings const&) const -AllSettings::operator==(AllSettings const&) const AlphaMask::AlphaMask(AlphaMask&&) AlphaMask::operator=(Bitmap const&) -Animation::Adjust(short, short, short, short, short, double, bool) -Animation::Convert(BmpConversion) -Animation::Draw(OutputDevice&, Point const&) const -Animation::Draw(OutputDevice&, Point const&, Size const&) const -Animation::GetChecksum() const -Animation::GetSizeBytes() const -Animation::IsTransparent() const -Animation::Mirror(BmpMirrorFlags) -Animation::ResetLoopCount() -Animation::Start(OutputDevice&, Point const&, Size const&, long, OutputDevice*) -Animation::Stop(OutputDevice const*, long) -Animation::operator=(Animation const&) -Animation::operator==(Animation const&) const -AnimationRenderer::createAnimationData() const -AnimationRenderer::draw(unsigned long, VirtualDevice*) -AnimationRenderer::repaint() -AnimationRenderer::~AnimationRenderer() -Application::DeInit() -Application::EnableBitmapRendering() -Application::GetAppLocaleDataWrapper() -Application::GetSystemDependentDataManager() -Application::HandleKey(VclEventId, vcl::Window*, KeyEvent*) -Application::ImplCallEventListeners(VclSimpleEvent&) -Application::ImplCallEventListenersApplicationDataChanged(void*) -Application::InsertAccel(Accelerator*) -Application::IsBitmapRendering() -Application::Main() -Application::RemoveAccel(Accelerator const*) -Application::setDeInitHook(Link<LinkParamNone*, void> const&) AsWinding(SkPath const&, SkPath*) AsyncQuitHandler::AsyncQuitHandler() AsyncQuitHandler::OnAsyncQuit(AsyncQuitHandler*, void*) @@ -62,44 +29,11 @@ BasicManager::SetLibraryContainerInfo(LibraryContainerInfo const&) BasicManager::~BasicManager() BigInt::BigInt(unsigned int) BigInt::operator%=(BigInt const&) -BinaryDataContainer::calculateHash() const -BinaryDataContainer::ensureSwappedIn() const -BinaryDataContainer::getAsStream() -BinaryDataContainer::getAsXInputStream() -BinaryDataContainer::getCopyAsByteSequence() const -BinaryDataContainer::getSizeBytes() const -BinaryDataContainer::swapOut() const -Bitmap::AdaptBitCount(Bitmap&) const -Bitmap::Adjust(short, short, short, short, short, double, bool, bool) -Bitmap::Bitmap(std::shared_ptr<SalBitmap>) -Bitmap::Blend(AlphaMask const&, Color const&) -Bitmap::CopyPixel(tools::Rectangle const&, tools::Rectangle const&) -Bitmap::CopyPixel(tools::Rectangle const&, tools::Rectangle const&, Bitmap const&) -Bitmap::CopyPixel_AlphaOptimized(tools::Rectangle const&, tools::Rectangle const&) -Bitmap::CopyPixel_AlphaOptimized(tools::Rectangle const&, tools::Rectangle const&, AlphaMask const&) -Bitmap::CreateDisplayBitmap(OutputDevice*) const -Bitmap::CreateRegion(Color const&, tools::Rectangle const&) const -Bitmap::Expand(int, int, Color const*) -Bitmap::Replace(AlphaMask const&, Color const&) -Bitmap::Replace(Color const&, Color const&, unsigned char) -Bitmap::Replace(Color const*, Color const*, unsigned long, unsigned char const*) -Bitmap::ReplaceMask(AlphaMask const&, Color const&) -Bitmap::Rotate(o3tl::strong_int<short, FractionTag<10> >, Color const&) -Bitmap::accessSystemDependentDataHolder() const BitmapAlphaClampFilter::execute(BitmapEx const&) const BitmapBasicMorphologyFilter::filter(Bitmap const&) const BitmapColorQuantizationFilter::execute(BitmapEx const&) const BitmapConvolutionMatrixFilter::execute(BitmapEx const&) const BitmapEmbossGreyFilter::execute(BitmapEx const&) const -BitmapEx::AdjustTransparency(unsigned char) -BitmapEx::ChangeColorAlpha(unsigned char, signed char) -BitmapEx::Clear() -BitmapEx::ClearAlpha() -BitmapEx::Draw(OutputDevice*, Point const&) const -BitmapEx::Replace(Color const&, Color const&, unsigned char) -BitmapEx::SetSizePixel(Size const&) -BitmapEx::getTransformed(basegfx::B2DHomMatrix const&, basegfx::B2DRange const&, double) const -BitmapEx::loadFromIconTheme(rtl::OUString const&) BitmapFilterStackBlur::execute(BitmapEx const&) const BitmapHelper::BitmapHelper(SalBitmap const&, bool) BitmapHelper::getBits(int&) @@ -109,14 +43,6 @@ BitmapInfoAccess::GetMatchingPaletteIndex(BitmapColor const&) const BitmapMedianFilter::execute(BitmapEx const&) const BitmapMonochromeFilter::execute(BitmapEx const&) const BitmapMosaicFilter::execute(BitmapEx const&) const -BitmapPalette::BitmapPalette(BitmapColor const*, BitmapColor const*) -BitmapPalette::BitmapPalette(BitmapPalette&&) -BitmapPalette::GetChecksum() const -BitmapPalette::GetMatchingIndex(BitmapColor const&) const -BitmapPalette::IsGreyPalette8Bit() const -BitmapPalette::IsGreyPaletteAny() const -BitmapPalette::operator=(BitmapPalette&&) -BitmapPalette::operator==(BitmapPalette const&) const BitmapPopArtFilter::execute(BitmapEx const&) const BitmapSepiaFilter::execute(BitmapEx const&) const BitmapShadowFilter::execute(BitmapEx const&) const @@ -125,9 +51,6 @@ BitmapSmoothenFilter::execute(BitmapEx const&) const BitmapSobelGreyFilter::execute(BitmapEx const&) const BitmapSolarizeFilter::execute(BitmapEx const&) const BitmapSymmetryCheck::checkImpl(BitmapReadAccess const*) -BitmapWriteAccess::CopyScanline(long, BitmapReadAccess const&) -BitmapWriteAccess::CopyScanline(long, unsigned char const*, ScanlineFormat, unsigned int) -BitmapWriteAccess::DrawLine(Point const&, Point const&) BitmapWriteAccess::SetFillColor() BmpWriter(SvStream&, Graphic const&, FilterConfigItem*) BrowseBox::BrowseBox(vcl::Window*, long, BrowserMode) @@ -158,16 +81,6 @@ BuilderBase::collectAtkRelationAttribute(xmlreader::XmlReader&, std::map<rtl::OU BuilderBase::collectAtkRoleAttribute(xmlreader::XmlReader&, std::map<rtl::OUString, rtl::OUString, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > >&) BuilderBase::collectPangoAttribute(xmlreader::XmlReader&, std::map<rtl::OUString, rtl::OUString, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > >&) BuilderBase::isToolbarItemClass(std::basic_string_view<char16_t, std::char_traits<char16_t> >) -Button::Button(WindowType) -Button::GetButtonState() -Button::GetButtonState() const -Button::GetCustomButtonImage() const -Button::GetModeImage() const -Button::HasImage() const -Button::IsSmallSymbol() const -Button::SetCommandHandler(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) -Button::SetCustomButtonImage(Image const&) -Button::SetSmallSymbol() CLuceneError::CLuceneError() CLuceneError::CLuceneError(CLuceneError const&) CLuceneError::CLuceneError(int, char const*, bool) @@ -239,30 +152,6 @@ ColorWindow::SelectEntry(NamedColor const&) ColorWindow::SelectValueSetEntry(SvxColorValueSet*, Color const&) ColorWindow::ShowNoneButton() ColorWindow::statusChanged(com::sun::star::frame::FeatureStateEvent const&) -ComboBox::AdaptDropDownLineCountToMaximum() -ComboBox::AddSeparator(int) -ComboBox::DoubleClick() -ComboBox::DrawEntry(UserDrawEvent const&) -ComboBox::EnableUserDraw(bool) -ComboBox::GetDropDownEntryHeight() const -ComboBox::GetEntryData(int) const -ComboBox::GetMRUEntries() const -ComboBox::GetMainWindow() const -ComboBox::GetMaxMRUCount() const -ComboBox::IsAutoSizeEnabled() const -ComboBox::IsDropDownBox() const -ComboBox::IsModifyByKeyboard() const -ComboBox::IsSyntheticModify() const -ComboBox::IsUserDrawEnabled() const -ComboBox::SetEntryActivateHdl(Link<Edit&, bool> const&) -ComboBox::SetEntryData(int, void*) -ComboBox::SetMRUEntries(std::basic_string_view<char16_t, std::char_traits<char16_t> >) -ComboBox::SetMaxMRUCount(int) -ComboBox::SetSelectHdl(Link<ComboBox&, void> const&) -ComboBox::SetUserDrawHdl(Link<UserDrawEvent*, void> const&) -ComboBox::SetUserItemSize(Size const&) -ComboBox::SetWidthInChars(int) -ComboBox::setMaxWidthChars(int) CommandEvent::CommandEvent() CommandEvent::GetAutoScrollData() const CommandEvent::GetGesturePanData() const @@ -480,20 +369,6 @@ DockingAreaWindow::Resize() DockingAreaWindow::StateChanged(StateChangedType) DockingAreaWindow::dispose() DockingAreaWindow::~DockingAreaWindow() -DockingManager::AddWindow(vcl::Window const*) -DockingManager::DockingManager() -DockingManager::GetDockingWindowWrapper(vcl::Window const*) -DockingManager::IsInPopupMode(vcl::Window const*) -DockingManager::RemoveWindow(vcl::Window const*) -DockingManager::SetPopupModeEndHdl(vcl::Window const*, Link<FloatingWindow*, void> const&) -DockingManager::StartPopupMode(vcl::Window const*, tools::Rectangle const&, FloatWinPopupFlags) -DockingManager::~DockingManager() -DockingWindow::DockingWindow(WindowType, char const*) -DockingWindow::DockingWindow(vcl::Window*, rtl::OUString const&, rtl::OUString const&, char const*, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) -DockingWindow::SetMaxOutputSizePixel(Size const&) -DockingWindow::isLayoutEnabled() const -DockingWindow::loadUI(vcl::Window*, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) -DockingWindow::setOptimalLayoutSize() DocumentSignatureManager::ImplOpenSignatureStream(int, bool) DocumentSignatureManager::getGpgSecurityContext() const DocumentSignatureManager::getGpgSecurityEnvironment() @@ -517,11 +392,6 @@ DriverBlocklist::Parser::handleContent(xmlreader::XmlReader&) DriverBlocklist::Parser::handleDevices(DriverBlocklist::DriverInfo&, xmlreader::XmlReader&) DriverBlocklist::Parser::handleEntry(DriverBlocklist::DriverInfo&, xmlreader::XmlReader&) DriverBlocklist::Parser::handleList(xmlreader::XmlReader&) -DropTargetHelper::AcceptDrop(AcceptDropEvent const&) -DropTargetHelper::ExecuteDrop(ExecuteDropEvent const&) -DropTargetHelper::ImplBeginDrag(com::sun::star::uno::Sequence<com::sun::star::datatransfer::DataFlavor> const&) -DropTargetHelper::ImplConstruct() -DropTargetHelper::ImplEndDrag() E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget&) const E3dAttributesUndoAction::Redo() E3dAttributesUndoAction::Undo() @@ -622,18 +492,6 @@ E3dView::InitView() EFieldInfo::EFieldInfo(EFieldInfo const&) EFieldInfo::EFieldInfo(SvxFieldItem const&, int, int) EFieldInfo::operator=(EFieldInfo const&) -Edit::CreatePopupMenu() -Edit::Edit(WindowType) -Edit::IsCharInput(KeyEvent const&) -Edit::IsInsertMode() const -Edit::SetCursorAtLast() -Edit::SetInsertMode(bool) -Edit::SetPlaceholderText(rtl::OUString const&) -Edit::SetSubEdit(Edit*) -Edit::SetWidthInChars(int) -Edit::ShowTruncationWarning(weld::Widget*) -Edit::Undo() -Edit::setMaxWidthChars(int) EditAbstractDialogFactory::Create() EditEngine::AppendDeletedNodeInfo(DeletedNodeInfo*) EditEngine::CallHtmlImportHandler(HtmlImportInfo&) @@ -835,13 +693,6 @@ FilterConfigItem::GetStatusIndicator() const FilterConfigItem::ImpInitTree(std::basic_string_view<char16_t, std::char_traits<char16_t> >) FilterConfigItem::ImplGetPropertyValue(com::sun::star::uno::Any&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, rtl::OUString const&) FilterConfigItem::WritePropertyValue(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, com::sun::star::beans::PropertyValue const&) -FixedBitmap::ApplySettings(OutputDevice&) -FixedBitmap::DataChanged(DataChangedEvent const&) -FixedBitmap::Draw(OutputDevice*, Point const&, SystemTextColorFlags) -FixedBitmap::Paint(OutputDevice&, tools::Rectangle const&) -FixedBitmap::Resize() -FixedBitmap::SetBitmap(BitmapEx const&) -FixedBitmap::StateChanged(StateChangedType) FixedHyperlink::GetFocus() FixedHyperlink::Initialize() FixedHyperlink::KeyInput(KeyEvent const&) @@ -850,16 +701,6 @@ FixedHyperlink::MouseButtonUp(MouseEvent const&) FixedHyperlink::MouseMove(MouseEvent const&) FixedHyperlink::RequestHelp(HelpEvent const&) FixedHyperlink::set_property(rtl::OUString const&, rtl::OUString const&) -FixedImage::ApplySettings(OutputDevice&) -FixedImage::DataChanged(DataChangedEvent const&) -FixedImage::Draw(OutputDevice*, Point const&, SystemTextColorFlags) -FixedImage::DumpAsPropertyTree(tools::JsonWriter&) -FixedImage::GetOptimalSize() const -FixedImage::Paint(OutputDevice&, tools::Rectangle const&) -FixedImage::Resize() -FixedImage::StateChanged(StateChangedType) -FixedImage::loadThemeImage(rtl::OUString const&) -FixedImage::set_property(rtl::OUString const&, rtl::OUString const&) FixedLine::ApplySettings(OutputDevice&) FixedLine::DataChanged(DataChangedEvent const&) FixedLine::Draw(OutputDevice*, Point const&, SystemTextColorFlags) @@ -890,21 +731,6 @@ FixedText::setMinWidthChars(int) FixedText::set_mnemonic_widget(vcl::Window*) FixedText::set_property(rtl::OUString const&, rtl::OUString const&) FixedText::~FixedText() -FloatingWindow::AddPopupModeWindow(vcl::Window*) -FloatingWindow::ApplySettings(OutputDevice&) -FloatingWindow::DataChanged(DataChangedEvent const&) -FloatingWindow::EventNotify(NotifyEvent&) -FloatingWindow::FloatingWindow(vcl::Window*, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) -FloatingWindow::ImplConvertToRelPos(vcl::Window*, AbsoluteScreenPixelRectangle const&) -FloatingWindow::PixelInvalidate(tools::Rectangle const*) -FloatingWindow::PopupModeEnd() -FloatingWindow::SetTitleType(FloatWinTitleType) -FloatingWindow::StartPopupMode(ToolBox*, FloatWinPopupFlags) -FloatingWindow::StartPopupMode(tools::Rectangle const&, FloatWinPopupFlags) -FloatingWindow::StateChanged(StateChangedType) -FloatingWindow::dispose() -FloatingWindow::doDeferredInit(long) -FloatingWindow::~FloatingWindow() FmDesignModeChangedHint::FmDesignModeChangedHint(bool) FmDesignModeChangedHint::~FmDesignModeChangedHint() FmFormModel::AllocPage(bool) @@ -976,28 +802,11 @@ FocusListenerMultiplexer::focusLost(com::sun::star::awt::FocusEvent const&) FocusListenerMultiplexer::queryInterface(com::sun::star::uno::Type const&) FocusListenerMultiplexer::release() FontAttributes::CompareDeviceIndependentFontAttributes(FontAttributes const&) const -FontCharMap::FontCharMap(bool, std::vector<unsigned int, std::allocator<unsigned int> >) -FontCharMap::FontCharMap(tools::SvRef<ImplFontCharMap>) -FontCharMap::findRangeIndex(unsigned int) const -FontCharMap::isMicrosoftSymbolMap() const -FontCharMap::~FontCharMap() FontConfigFontOptions::SyncPattern(rtl::OString const&, unsigned int, unsigned int, bool) FontConfigFontOptions::cairo_font_options_substitute(_FcPattern*) FontConfigFontOptions::~FontConfigFontOptions() FontList::GetNextFontMetric(void*) FontList::GetStyleName(FontWeight, FontItalic) const -FontMetric::EqualIgnoreColor(FontMetric const&) const -FontMetric::EqualNoBase(FontMetric const&) const -FontMetric::FontMetric(vcl::font::PhysicalFontFace const&) -FontMetric::GetHashValueIgnoreColor() const -FontMetric::GetHashValueNoBase() const -FontMetricData::FontMetricData(vcl::font::FontSelectPattern const&) -FontMetricData::ImplInitAboveTextLineSize(OutputDevice const*) -FontMetricData::ImplInitFlags(OutputDevice const*) -FontMetricData::ImplInitTextLineSize(OutputDevice const*) -FontMetricData::ImplInitTextLineSizeHarfBuzz(LogicalFontInstance*) -FontMetricData::ShouldNotUseUnderlineMetrics() const -FontMetricData::ShouldUseWinMetrics(int, int, int, int, int, int) const FontNameBox::CachePreview(unsigned long, Point*, int, int) FontNameBox::InitFontMRUEntriesFile() FontNameBox::LoadMRUEntries(rtl::OUString const&) @@ -1007,11 +816,6 @@ FontSizeBox::SetValue(int, FieldUnit) FontSizeBox::format_number(int) const FontSizeNames::Name2Size(std::basic_string_view<char16_t, std::char_traits<char16_t> >) const FontSizeNames::Size2Name(int) const -FontSubsetInfo::CreateFontSubset(FontType, SvStream*, char const*, unsigned int const*, unsigned char const*, int) -FontSubsetInfo::CreateFontSubsetFromCff() -FontSubsetInfo::FontSubsetInfo() -FontSubsetInfo::LoadFont(FontType, unsigned char const*, int) -FontSubsetInfo::~FontSubsetInfo() FormattedField::Down() FormattedField::DumpAsPropertyTree(tools::JsonWriter&) FormattedField::EventNotify(NotifyEvent&) @@ -1054,29 +858,7 @@ Fraction::Fraction(double, double) Fraction::operator-=(Fraction const&) FrameDeleteWatch::Notify(SfxHint const&) FreeTypeTextRenderImpl::ClearDevFontCache() -FreetypeFont::ApplyGlyphTransform(bool, FT_GlyphRec_*) const -FreetypeFont::FreetypeFont(FreetypeFontInstance&, std::shared_ptr<FreetypeFontInfo>) -FreetypeFont::GetFontFaceIndex() const -FreetypeFont::GetFontFaceVariation() const -FreetypeFont::GetFontFileName() const -FreetypeFont::GetFontMetric(tools::SvRef<FontMetricData> const&) const -FreetypeFont::GetFtFace() const -FreetypeFont::GetGlyphOutline(unsigned int, basegfx::B2DPolyPolygon&, bool) const -FreetypeFont::~FreetypeFont() -FreetypeManager::AnnounceFonts(vcl::font::PhysicalFontCollection*) const -FreetypeManager::CreateFont(FreetypeFontInstance*) -FreetypeManager::FindFontFile(rtl::OString const&) -FreetypeManager::FreetypeManager() -FreetypeManager::InitFreetype() -FreetypeManager::~FreetypeManager() FuConstUnoControl::Activate() -GDIMetaFile::GetSizeBytes() const -GDIMetaFile::Linker(OutputDevice*, bool) -GDIMetaFile::Mirror(BmpMirrorFlags) -GDIMetaFile::ReplaceAction(rtl::Reference<MetaAction>, unsigned long) -GDIMetaFile::Rotate(o3tl::strong_int<short, FractionTag<10> >) -GDIMetaFile::dumpAsXml(char const*) const -GDIMetaFile::push_back(rtl::Reference<MetaAction> const&) GLWindow::Synchronize(bool) const GUB_count GalleryExplorer::BeginLocking(std::basic_string_view<char16_t, std::char_traits<char16_t> >) @@ -1105,35 +887,6 @@ GalleryThemeEntry::getCachedTheme(Gallery*) GalleryThemeEntry::removeTheme() GalleryThemeEntry::setStorageLocations(INetURLObject&) GalleryThemeEntry::~GalleryThemeEntry() -GenPspGraphics::AddTempDevFont(vcl::font::PhysicalFontCollection*, rtl::OUString const&, rtl::OUString const&) -GenPspGraphics::ClearDevFontCache() -GenPspGraphics::CreateBitmapSurface(OutputDevice const&, BitmapSystemData const&, Size const&) const -GenPspGraphics::CreateSurface(OutputDevice const&, int, int, int, int) const -GenPspGraphics::CreateSurface(std::shared_ptr<_cairo_surface> const&) const -GenPspGraphics::DrawTextLayout(GenericSalLayout const&) -GenPspGraphics::GetDevFontList(vcl::font::PhysicalFontCollection*) -GenPspGraphics::GetFontCapabilities(vcl::FontCapabilities&) const -GenPspGraphics::GetFontCharMap() const -GenPspGraphics::GetFontMetric(tools::SvRef<FontMetricData>&, int) -GenPspGraphics::GetGraphicsData() const -GenPspGraphics::GetNativeSurfaceHandle(std::shared_ptr<cairo::Surface>&, basegfx::B2ISize const&) const -GenPspGraphics::GetResolution(int&, int&) -GenPspGraphics::GetTextLayout(int) -GenPspGraphics::Init(psp::JobData*) -GenPspGraphics::SetFont(LogicalFontInstance*, int) -GenPspGraphics::SetTextColor(Color) -GenPspGraphics::SupportsCairo() const -GenPspGraphics::~GenPspGraphics() -GenericSalLayout::ApplyAsianKerning(std::basic_string_view<char16_t, std::char_traits<char16_t> >) -GenericSalLayout::ApplyDXArray(double const*, unsigned char const*) -GenericSalLayout::DropGlyph(int) -GenericSalLayout::GetCharWidths(std::vector<double, std::allocator<double> >&, rtl::OUString const&) const -GenericSalLayout::HasVerticalAlternate(unsigned int, unsigned int) -GenericSalLayout::Justify(double) -GenericSalLayout::MoveGlyph(int, double) -GenericSalLayout::ParseFeatures(std::basic_string_view<char16_t, std::char_traits<char16_t> >) -GenericSalLayout::SetNeedFallback(vcl::text::ImplLayoutArgs&, int, bool) -GenericSalLayout::Simplify(bool) GenericUnixSalData::InitFreetypeManager() GenericUnixSalData::InitPrintFontManager() GetODFSaneDefaultVersion(SvtSaveOptions::ODFDefaultVersion) @@ -1319,22 +1072,9 @@ GrYUVABackendTextureInfo::operator==(GrYUVABackendTextureInfo const&) const GrYUVABackendTextureInfo::toYUVALocations() const GrYUVABackendTextures::GrYUVABackendTextures(SkYUVAInfo const&, GrBackendTexture const*, GrSurfaceOrigin) GrYUVABackendTextures::toYUVALocations() const -Gradient::DrawComplexGradientToMetafile(tools::Rectangle const&, GDIMetaFile&) const -Gradient::DrawLinearGradientToMetafile(tools::Rectangle const&, GDIMetaFile&) const -Gradient::GetMetafileSteps(tools::Rectangle const&) const -Gradient::MakeGrayscale() Gradient::operator=(Gradient const&) Gradient::operator=(Gradient&&) Gradient::operator==(Gradient const&) const -Graphic::GetAnimationLoopCount() const -Graphic::GetAnimationNotifyHdl() const -Graphic::Graphic(std::shared_ptr<GfxLink> const&, int) -Graphic::IsDummyContext() const -Graphic::IsEPS() const -Graphic::SetAnimationNotifyHdl(Link<Animation*, void> const&) -Graphic::SetDummyContext(bool) -Graphic::SetReaderContext(std::shared_ptr<GraphicReader> const&) -Graphic::getUniqueID() const GraphicConverter::GraphicConverter() GraphicDescriptor::ImpConstruct() GraphicDescriptor::ImpDetectBMP(SvStream&, bool) @@ -1628,21 +1368,6 @@ ImageControl::ImplDraw(OutputDevice&, Point const&, Size const&) const ImageControl::LoseFocus() ImageControl::Paint(OutputDevice&, tools::Rectangle const&) ImageControl::Resize() -ImageMap::ImpDetectFormat(SvStream&) -ImageMap::ImpReadCERN(SvStream&) -ImageMap::ImpReadCERNCoords(char const**) -ImageMap::ImpReadCERNLine(std::basic_string_view<char, std::char_traits<char> >) -ImageMap::ImpReadCERNRadius(char const**) -ImageMap::ImpReadCERNURL(char const**) -ImageMap::ImpReadImageMap(SvStream&, unsigned long) -ImageMap::ImpReadNCSA(SvStream&) -ImageMap::ImpReadNCSACoords(char const**) -ImageMap::ImpReadNCSALine(std::basic_string_view<char, std::char_traits<char> >) -ImageMap::ImpReadNCSAURL(char const**) -ImageMap::ImpWriteCERN(SvStream&) const -ImageMap::ImpWriteImageMap(SvStream&) const -ImageMap::ImpWriteNCSA(SvStream&) const -ImageMap::Write(SvStream&) const ImageTree::getNameAccess() ImageTree::loadImage(rtl::OUString const&, rtl::OUString const&, BitmapEx&, bool, int, ImageLoadFlags) ImageTree::shutdown() @@ -1777,16 +1502,6 @@ LogLuv24fromXYZ LogLuv24toXYZ LogLuv32fromXYZ LogLuv32toXYZ -LogicalFontInstance::AddFallbackForUnicode(unsigned int, FontWeight, rtl::OUString const&, bool, ItalicMatrix const&) -LogicalFontInstance::GetFallbackForUnicode(unsigned int, FontWeight, rtl::OUString*, bool*, ItalicMatrix*) const -LogicalFontInstance::GetGlyphOutlineUntransformed(unsigned int) const -LogicalFontInstance::GetGlyphWidth(unsigned int, bool, bool) const -LogicalFontInstance::GetHbFontUntransformed() const -LogicalFontInstance::GetScale(double*, double*) const -LogicalFontInstance::IgnoreFallbackForUnicode(unsigned int, FontWeight, std::basic_string_view<char16_t, std::char_traits<char16_t> >) -LogicalFontInstance::InitHbFont() -LogicalFontInstance::IsGraphiteFont() -LogicalFontInstance::NeedOffsetCorrection(int) LokChartHelper::Hit(Point const&) LokChartHelper::HitAny(Point const&, bool) LokChartHelper::Invalidate() @@ -1826,34 +1541,6 @@ Menu::SetAccessibleName(unsigned short, rtl::OUString const&) Menu::dispose() Menu::operator=(Menu const&) Menu::~Menu() -MenuBar::AddMenuBarButton(Image const&, Link<MenuBarButtonCallbackArg&, bool> const&, rtl::OUString const&) -MenuBar::ClosePopup(Menu*) -MenuBar::GetMenuBarButtonRectPixel(unsigned short) -MenuBar::GetMenuBarHeight() const -MenuBar::HandleMenuHighlightEvent(Menu*, unsigned short) const -MenuBar::MenuBar(MenuBar const&) -MenuBar::MenuBarKeyInput(KeyEvent const&) -MenuBar::RemoveMenuBarButton(unsigned short) -MenuBar::SelectItem(unsigned short) -MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link<MenuBarButtonCallbackArg&, bool> const&) -MenuBar::ShowButtons(bool, bool, bool) -MenuBar::dispose() -MenuBar::getMenuBarWindow() -MenuBar::~MenuBar() -MenuBarUpdateIconManager::AddMenuBarIcon(SystemWindow&, bool) -MenuBarUpdateIconManager::GetBubbleWindow() -MenuBarUpdateIconManager::GetIconID(MenuBar*) const -MenuBarUpdateIconManager::MenuBarUpdateIconManager() -MenuBarUpdateIconManager::RemoveBubbleWindow() -MenuBarUpdateIconManager::RemoveMenuBarIcon(MenuBar*) -MenuBarUpdateIconManager::RemoveMenuBarIcons() -MenuBarUpdateIconManager::SetBubbleChanged() -MenuBarUpdateIconManager::SetBubbleImage(Image const&) -MenuBarUpdateIconManager::SetBubbleText(rtl::OUString const&) -MenuBarUpdateIconManager::SetBubbleTitle(rtl::OUString const&) -MenuBarUpdateIconManager::SetShowBubble(bool) -MenuBarUpdateIconManager::SetShowMenuIcon(bool) -MenuBarUpdateIconManager::~MenuBarUpdateIconManager() MenuButton::Activate() MenuButton::CancelMenu() MenuButton::DumpAsPropertyTree(tools::JsonWriter&) @@ -18599,46 +18286,7 @@ vcl::ControlLayoutData::ToRelativeLineIndex(long) const vcl::ConvertDoubleValue(double, long, unsigned short, FieldUnit, FieldUnit) vcl::CreateTTFfontSubset(vcl::AbstractTrueTypeFont&, std::vector<unsigned char, std::allocator<unsigned char> >&, unsigned int const*, unsigned char const*, int, FontSubsetInfo&) vcl::CreateTTFromTTGlyphs(vcl::AbstractTrueTypeFont*, std::vector<unsigned char, std::allocator<unsigned char> >&, unsigned short const*, unsigned char const*, int) -vcl::Cursor::Cursor(vcl::Cursor const&) -vcl::Cursor::ImplDoHide(bool) -vcl::Cursor::ImplDoShow(bool, bool) -vcl::Cursor::ImplPrepForDraw(OutputDevice const*, ImplCursorData&) -vcl::Cursor::ImplRestore() -vcl::Cursor::LOKNotify(vcl::Window*, rtl::OUString const&) -vcl::Cursor::operator=(vcl::Cursor const&) -vcl::Cursor::operator==(vcl::Cursor const&) const -vcl::DefaultTextLayout::DecomposeTextRectAction() const -vcl::DefaultTextLayout::DrawText(Point const&, rtl::OUString const&, int, int, std::vector<tools::Rectangle, std::allocator<tools::Rectangle> >*, rtl::OUString*) -vcl::DefaultTextLayout::GetTextArray(rtl::OUString const&, KernArray*, int, int, bool) const -vcl::DefaultTextLayout::GetTextBreak(rtl::OUString const&, long, int, int) const -vcl::DefaultTextLayout::GetTextWidth(rtl::OUString const&, int, int) const -vcl::EnumContext::AddEntry(rtl::OUString const&, vcl::EnumContext::Application) -vcl::EnumContext::AddEntry(rtl::OUString const&, vcl::EnumContext::Context) -vcl::EnumContext::GetApplication_DI() const -vcl::EnumContext::ProvideApplicationContainers() -vcl::EnumContext::ProvideContextContainers() vcl::ExtOutDevData::~ExtOutDevData() -vcl::Font::EqualIgnoreColor(vcl::Font const&) const -vcl::Font::GetAverageFontSize() const -vcl::Font::GetCJKContextLanguageTag() const -vcl::Font::GetFontAttributes(FontAttributes&) const -vcl::Font::GetFontFamily() const -vcl::Font::GetHashValueIgnoreColor() const -vcl::Font::GetLanguageTag() const -vcl::Font::SetCJKContextLanguageTag(LanguageTag const&) -vcl::Font::SetLanguageTag(LanguageTag const&) -vcl::GetTTGlobalFontHeadInfo(vcl::AbstractTrueTypeFont const*, int&, int&, int&, int&, unsigned short&) -vcl::GetTTGlobalFontInfo(vcl::AbstractTrueTypeFont*, vcl::TTGlobalFontInfo_*) -vcl::GraphicFormatDetector::checkAndUncompressBuffer(unsigned char*, unsigned int, unsigned long&) -vcl::GraphicFormatDetector::checkDXF() -vcl::GraphicFormatDetector::checkMOV() -vcl::GraphicFormatDetector::checkPBM() -vcl::GraphicFormatDetector::checkPCD() -vcl::GraphicFormatDetector::checkPCT() -vcl::GraphicFormatDetector::checkPGM() -vcl::GraphicFormatDetector::checkPPM() -vcl::GraphicFormatDetector::checkRAS() -vcl::GraphicFormatDetector::checkSVM() vcl::I18nHelper::I18nHelper(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, LanguageTag) vcl::I18nHelper::filterFormattingChars(rtl::OUString const&) vcl::I18nHelper::~I18nHelper() @@ -18691,233 +18339,12 @@ vcl::PDFExtOutDevData::RegisterDest() vcl::PaintBufferGuard::SetPaintRect(tools::Rectangle const&) vcl::PngImageReader::getMicrosoftGifChunk(SvStream&) vcl::PngImageReader::isAPng(SvStream&) -vcl::PrinterController::abortJob() -vcl::PrinterController::createProgressDialog() -vcl::PrinterController::getBoolProperty(rtl::OUString const&, bool) const -vcl::PrinterController::getFilteredPageCount() const -vcl::PrinterController::getFilteredPageFile(int, GDIMetaFile&, bool) -vcl::PrinterController::getIntProperty(rtl::OUString const&, int) const -vcl::PrinterController::getJobState() const -vcl::PrinterController::getPrinterModified() const -vcl::PrinterController::getUIOptions() const -vcl::PrinterController::getWindow() const -vcl::PrinterController::isDirectPrint() const -vcl::PrinterController::isProgressCanceled() const -vcl::PrinterController::isShowDialogs() const -vcl::PrinterController::isUIChoiceEnabled(rtl::OUString const&, int) const -vcl::PrinterController::isUIOptionEnabled(rtl::OUString const&) const -vcl::PrinterController::jobFinished(com::sun::star::view::PrintableState) -vcl::PrinterController::jobStarted() -vcl::PrinterController::makeEnabled(rtl::OUString const&) -vcl::PrinterController::printFilteredPage(int) -vcl::PrinterController::setLastPage(bool) -vcl::PrinterController::setValue(com::sun::star::beans::PropertyValue const&) vcl::PrinterOptionsHelper::setUIControlOpt(com::sun::star::uno::Sequence<rtl::OUString> const&, rtl::OUString const&, com::sun::star::uno::Sequence<rtl::OUString> const&, rtl::OUString const&, com::sun::star::beans::PropertyValue const*, vcl::PrinterOptionsHelper::UIControlOptions const&) vcl::ReadRegion(SvStream&, vcl::Region&) vcl::Region::GetAsRegionBand() const vcl::Region::Overlaps(tools::Rectangle const&) const vcl::Region::Scale(double, double) vcl::ScriptRun::next() -vcl::SettingsConfigItem::ImplCommit() -vcl::SettingsConfigItem::Notify(com::sun::star::uno::Sequence<rtl::OUString> const&) -vcl::SettingsConfigItem::SettingsConfigItem() -vcl::SettingsConfigItem::getValues() -vcl::SettingsConfigItem::setValue(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) -vcl::SettingsConfigItem::~SettingsConfigItem() -vcl::TextLayoutCommon::BreakLineSimple(long, rtl::OUString const&, int, int, long) -vcl::TextLayoutCommon::GetCenterEllipsisString(std::basic_string_view<char16_t, std::char_traits<char16_t> >, int, long) -vcl::TextLayoutCommon::GetEllipsisString(rtl::OUString const&, long, DrawTextFlags) -vcl::TextLayoutCommon::GetEndEllipsisString(rtl::OUString const&, int, long, bool) -vcl::TextLayoutCommon::GetNewsEllipsisString(rtl::OUString const&, long, DrawTextFlags) -vcl::TextLayoutCommon::GetTextLines(tools::Rectangle const&, long, ImplMultiTextLineInfo&, long, rtl::OUString const&, DrawTextFlags) -vcl::TextLayoutCommon::~TextLayoutCommon() -vcl::WidgetDefinitionReader::readDefinition(tools::XmlWalker&, vcl::WidgetDefinition&, ControlType) -vcl::WidgetDefinitionReader::readDrawingDefinition(tools::XmlWalker&, std::shared_ptr<vcl::WidgetDefinitionState> const&) -vcl::WidgetDefinitionReader::readPart(tools::XmlWalker&, std::shared_ptr<vcl::WidgetDefinitionPart>) -vcl::Window::CalcOutputSize(Size const&) const -vcl::Window::EnableAlwaysOnTop(bool) -vcl::Window::EnableInput(bool, vcl::Window const*) -vcl::Window::EndAutoScroll() -vcl::Window::EndExtTextInput() -vcl::Window::EndSaveFocus(VclPtr<vcl::Window> const&) -vcl::Window::Erase(OutputDevice&) -vcl::Window::GetActivateMode() const -vcl::Window::GetCursorExtTextInputWidth() const -vcl::Window::GetCursorRect() const -vcl::Window::GetDialogControlFlags() const -vcl::Window::GetDrawPixel(OutputDevice const*, long) const -vcl::Window::GetLastPointerPosPixel() -vcl::Window::GetNativeControlRegion(ControlType, ControlPart, tools::Rectangle const&, ControlState, ImplControlValue const&, tools::Rectangle&, tools::Rectangle&) const -vcl::Window::GetOutputRectPixel() const -vcl::Window::GetOverlineColor() const -vcl::Window::GetParentClipMode() const -vcl::Window::GetParentDialog() const -vcl::Window::GetPrevStyle() const -vcl::Window::GetTextAlign() const -vcl::Window::HasPaintEvent() const -vcl::Window::ImplGetWindow() const -vcl::Window::InvalidateSizeCache() -vcl::Window::IsAlwaysEnableInput() const -vcl::Window::IsAlwaysOnTopEnabled() const -vcl::Window::IsCreatedWithToolkit() const -vcl::Window::IsDefaultSize() const -vcl::Window::IsDialogControlStart() const -vcl::Window::IsDockingWindow() const -vcl::Window::IsInInitShow() const -vcl::Window::IsLOKWindowsEmpty() -vcl::Window::IsNativeControlSupported(ControlType, ControlPart) const -vcl::Window::IsOverlineColor() const -vcl::Window::IsScrollable() const -vcl::Window::IsTextFillColor() const -vcl::Window::NormalizedScreenToOutputPixel(Point const&) const -vcl::Window::NotifyAllChildren(DataChangedEvent&) -vcl::Window::PixelToLogic(vcl::Region const&) const -vcl::Window::SaveFocus() -vcl::Window::SetAccessibleDescription(rtl::OUString const&) -vcl::Window::SetAccessibleRelationLabelFor(vcl::Window*) -vcl::Window::SetAccessibleRelationLabeledBy(vcl::Window*) -vcl::Window::SetActivateMode(ActivateModeFlags) -vcl::Window::SetDumpAsPropertyTreeHdl(Link<tools::JsonWriter&, void> const&) -vcl::Window::SetFakeFocus(bool) -vcl::Window::SetHelpHdl(Link<vcl::Window&, bool> const&) -vcl::Window::SetMapMode() -vcl::Window::SetMnemonicActivateHdl(Link<vcl::Window&, bool> const&) -vcl::Window::SetOverlineColor() -vcl::Window::SetOverlineColor(Color const&) -vcl::Window::SetTextAlign(TextAlign) -vcl::Window::SetWindowRegionPixel() -vcl::Window::SetWindowRegionPixel(vcl::Region const&) -vcl::Window::StartAutoScroll(StartAutoScrollFlags) -vcl::Window::UpdateSettings(AllSettings const&, bool) -vcl::Window::Window(WindowType) -vcl::Window::add_mnemonic_label(FixedText*) -vcl::Window::add_to_size_group(std::shared_ptr<VclSizeGroup> const&) -vcl::Window::get_border_width() const -vcl::Window::get_fill() const -vcl::Window::get_grid_height() const -vcl::Window::get_grid_left_attach() const -vcl::Window::get_grid_top_attach() const -vcl::Window::get_grid_width() const -vcl::Window::get_halign() const -vcl::Window::get_hexpand() const -vcl::Window::get_margin_bottom() const -vcl::Window::get_margin_end() const -vcl::Window::get_margin_start() const -vcl::Window::get_margin_top() const -vcl::Window::get_non_homogeneous() const -vcl::Window::get_pack_type() const -vcl::Window::get_padding() const -vcl::Window::get_secondary() const -vcl::Window::get_ungrouped_preferred_size() const -vcl::Window::get_valign() const -vcl::Window::list_mnemonic_labels() const -vcl::Window::remove_from_all_size_groups() -vcl::Window::remove_mnemonic_label(FixedText*) -vcl::Window::reorderWithinParent(unsigned short) -vcl::Window::set_fill(bool) -vcl::Window::set_font_attribute(rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t> >) -vcl::Window::set_grid_height(int) -vcl::Window::set_grid_left_attach(int) -vcl::Window::set_grid_top_attach(int) -vcl::Window::set_grid_width(int) -vcl::Window::set_halign(VclAlign) -vcl::Window::set_margin_bottom(int) -vcl::Window::set_margin_end(int) -vcl::Window::set_margin_start(int) -vcl::Window::set_non_homogeneous(bool) -vcl::Window::set_pack_type(VclPackType) -vcl::Window::set_padding(int) -vcl::Window::set_secondary(bool) -vcl::Window::set_valign(VclAlign) -vcl::WizardMachine::RemovePage(BuilderPage const*) -vcl::WizardMachine::SetPage(short, std::unique_ptr<BuilderPage, std::default_delete<BuilderPage> >) -vcl::WizardMachine::getStateHistory(std::vector<short, std::allocator<short> >&) -vcl::WizardMachine::isAutomaticNextButtonStateEnabled() const -vcl::WizardMachine::isTravelingSuspended() const -vcl::WizardMachine::removePageFromHistory(short) -vcl::WizardMachine::resumeTraveling(vcl::WizardMachine::AccessGuard) -vcl::WizardMachine::suspendTraveling(vcl::WizardMachine::AccessGuard) -vcl::WriteRegion(SvStream&, vcl::Region const&) -vcl::bitmap::get_premultiply_table() -vcl::bitmap::get_unpremultiply_table() -vcl::bitmap::unpremultiply(unsigned char, unsigned char) -vcl::filter::PDFArrayElement::PushBack(vcl::filter::PDFElement*) -vcl::filter::PDFArrayElement::Read(SvStream&) -vcl::filter::PDFBooleanElement::Read(SvStream&) -vcl::filter::PDFCommentElement::PDFCommentElement(vcl::filter::PDFDocument&) -vcl::filter::PDFCommentElement::Read(SvStream&) -vcl::filter::PDFDictionaryElement::Lookup(std::map<rtl::OString, vcl::filter::PDFElement*, std::less<rtl::OString>, std::allocator<std::pair<rtl::OString const, vcl::filter::PDFElement*> > > const&, rtl::OString const&) -vcl::filter::PDFDictionaryElement::Read(SvStream&) -vcl::filter::PDFDictionaryElement::SetKeyOffset(rtl::OString const&, unsigned long) -vcl::filter::PDFDictionaryElement::SetKeyValueLength(rtl::OString const&, unsigned long) -vcl::filter::PDFDocument::DecodeHexString(vcl::filter::PDFHexStringElement const*) -vcl::filter::PDFDocument::FindStartXRef(SvStream&) -vcl::filter::PDFDocument::GetEditBuffer() -vcl::filter::PDFDocument::GetNextSignature() -vcl::filter::PDFDocument::GetObjectOffset(unsigned long) const -vcl::filter::PDFDocument::PushBackEOF(unsigned long) -vcl::filter::PDFDocument::ReadKeyword(SvStream&) -vcl::filter::PDFDocument::ReadWithPossibleFixup(SvStream&) -vcl::filter::PDFDocument::ReadXRef(SvStream&) -vcl::filter::PDFDocument::ReadXRefStream(SvStream&) -vcl::filter::PDFDocument::SetIDObject(unsigned long, vcl::filter::PDFObjectElement*) -vcl::filter::PDFDocument::SkipLineBreaks(SvStream&) -vcl::filter::PDFDocument::SkipWhitespace(SvStream&) -vcl::filter::PDFDocument::Tokenize(SvStream&, vcl::filter::TokenizeMode, std::vector<std::unique_ptr<vcl::filter::PDFElement, std::default_delete<vcl::filter::PDFElement> >, std::allocator<std::unique_ptr<vcl::filter::PDFElement, std::default_delete<vcl::filter::PDFElement> > > >&, vcl::filter::PDFObjectElement*) -vcl::filter::PDFDocument::WriteAnnotObject(vcl::filter::PDFObjectElement const&, int, int, tools::Rectangle const&) -vcl::filter::PDFDocument::WriteAppearanceObject(tools::Rectangle&) -vcl::filter::PDFDocument::WriteCatalogObject(int, vcl::filter::PDFReferenceElement*&) -vcl::filter::PDFDocument::WritePageObject(vcl::filter::PDFObjectElement&, int) -vcl::filter::PDFDocument::WriteSignatureObject(rtl::OUString const&, bool, unsigned long&, long&) -vcl::filter::PDFDocument::WriteXRef(unsigned long, vcl::filter::PDFReferenceElement const*) -vcl::filter::PDFDocument::createObject() -vcl::filter::PDFDocument::updateObject(int) -vcl::filter::PDFDocument::writeBufferBytes(void const*, unsigned long) -vcl::filter::PDFEndArrayElement::GetOffset() const -vcl::filter::PDFEndArrayElement::Read(SvStream&) -vcl::filter::PDFEndDictionaryElement::GetLocation() const -vcl::filter::PDFEndDictionaryElement::Read(SvStream&) -vcl::filter::PDFEndObjectElement::Read(SvStream&) -vcl::filter::PDFEndStreamElement::Read(SvStream&) -vcl::filter::PDFHexStringElement::GetValue() const -vcl::filter::PDFHexStringElement::Read(SvStream&) -vcl::filter::PDFLiteralStringElement::Read(SvStream&) -vcl::filter::PDFNameElement::GetLocation() const -vcl::filter::PDFNameElement::Read(SvStream&) -vcl::filter::PDFNullElement::Read(SvStream&) -vcl::filter::PDFNumberElement::GetLength() const -vcl::filter::PDFNumberElement::GetLocation() const -vcl::filter::PDFNumberElement::Read(SvStream&) -vcl::filter::PDFObjectElement::AddDictionaryReference(vcl::filter::PDFReferenceElement*) -vcl::filter::PDFObjectElement::GetArrayLength() const -vcl::filter::PDFObjectElement::GetArrayOffset() const -vcl::filter::PDFObjectElement::GetDictionaryReferences() const -vcl::filter::PDFObjectElement::GetDocument() -vcl::filter::PDFObjectElement::GetNumberElement() const -vcl::filter::PDFObjectElement::GetObjectValue() const -vcl::filter::PDFObjectElement::GetStoredElements() -vcl::filter::PDFObjectElement::GetStreamBuffer() const -vcl::filter::PDFObjectElement::ParseStoredObjects() -vcl::filter::PDFObjectElement::Read(SvStream&) -vcl::filter::PDFObjectElement::SetArray(vcl::filter::PDFArrayElement*) -vcl::filter::PDFObjectElement::SetArrayLength(unsigned long) -vcl::filter::PDFObjectElement::SetArrayOffset(unsigned long) -vcl::filter::PDFObjectElement::SetDictionary(vcl::filter::PDFDictionaryElement*) -vcl::filter::PDFObjectElement::SetDictionaryLength(unsigned long) -vcl::filter::PDFObjectElement::SetDictionaryOffset(unsigned long) -vcl::filter::PDFObjectElement::SetNumberElement(vcl::filter::PDFNumberElement*) -vcl::filter::PDFObjectElement::SetStream(vcl::filter::PDFStreamElement*) -vcl::filter::PDFObjectElement::SetStreamBuffer(std::unique_ptr<SvMemoryStream, std::default_delete<SvMemoryStream> >&) -vcl::filter::PDFObjectElement::parseIfNecessary() -vcl::filter::PDFReferenceElement::GetObjectElement() const -vcl::filter::PDFReferenceElement::GetOffset() const -vcl::filter::PDFReferenceElement::LookupNumber(SvStream&) const -vcl::filter::PDFReferenceElement::Read(SvStream&) -vcl::filter::PDFStreamElement::GetOffset() const -vcl::filter::PDFStreamElement::PDFStreamElement(unsigned long) -vcl::filter::PDFStreamElement::Read(SvStream&) -vcl::filter::PDFTrailerElement::GetLocation() const -vcl::filter::PDFTrailerElement::Read(SvStream&) vcl::font::FeatureDefinition::FeatureDefinition(unsigned int, TranslateId, rtl::OUString) vcl::font::FeatureDefinition::FeatureDefinition(unsigned int, TranslateId, std::vector<vcl::font::FeatureParameter, std::allocator<vcl::font::FeatureParameter> >) vcl::font::FeatureParameter::FeatureParameter(unsigned int, TranslateId) @@ -18925,33 +18352,6 @@ vcl::font::FeatureParameter::FeatureParameter(unsigned int, rtl::OUString) vcl::font::FontSelectPattern::hashCode() const vcl::font::FontSelectPattern::operator==(vcl::font::FontSelectPattern const&) const vcl::font::OpenTypeFeatureDefinitionList() -vcl::font::PhysicalFontCollection::Clear() -vcl::font::PhysicalFontCollection::Clone() const -vcl::font::PhysicalFontCollection::FindFontFamily(vcl::font::FontSelectPattern&) const -vcl::font::PhysicalFontCollection::GetFontFaceCollection() const -vcl::font::PhysicalFontCollection::GetGlyphFallbackFont(vcl::font::FontSelectPattern&, LogicalFontInstance*, rtl::OUString&, int) const -vcl::font::PhysicalFontCollection::ImplFindFontFamilyBySearchName(rtl::OUString const&) const -vcl::font::PhysicalFontCollection::ImplFindFontFamilyBySubstFontAttr(utl::FontNameAttr const&) const -vcl::font::PhysicalFontCollection::ImplFindFontFamilyOfDefaultFont() const -vcl::font::PhysicalFontCollection::ImplInitGenericGlyphFallback() const -vcl::font::PhysicalFontCollection::ImplInitMatchData() const -vcl::font::PhysicalFontCollection::SetFallbackHook(vcl::font::GlyphFallbackFontSubstitution*) -vcl::font::PhysicalFontCollection::SetPreMatchHook(vcl::font::PreMatchFontSubstitution*) -vcl::font::PhysicalFontFace::CreateFontSubset(std::vector<unsigned char, std::allocator<unsigned char> >&, unsigned int const*, unsigned char const*, int, FontSubsetInfo&) const -vcl::font::PhysicalFontFace::GetColorPalettes() const -vcl::font::PhysicalFontFace::GetGlyphColorBitmap(unsigned int, tools::Rectangle&) const -vcl::font::PhysicalFontFace::GetGlyphColorLayers(unsigned int) const -vcl::font::PhysicalFontFace::GetGlyphName(unsigned int, bool) const -vcl::font::PhysicalFontFace::GetHbUnscaledFont() const -vcl::font::PhysicalFontFace::GetName(vcl::font::NameID, LanguageTag const&) const -vcl::font::PhysicalFontFace::GetRawFontData(unsigned int) const -vcl::font::PhysicalFontFace::HasColorBitmaps() const -vcl::font::PhysicalFontFace::HasColorLayers() const -vcl::font::PhysicalFontFamily::CalcType(ImplFontAttrs&, FontWeight&, FontWidth&, FontFamily, utl::FontNameAttr const*) -vcl::font::PhysicalFontFamily::FindBestFontFace(vcl::font::FontSelectPattern const&) const -vcl::font::PhysicalFontFamily::InitMatchData(utl::FontSubstConfiguration const&, rtl::OUString const&) -vcl::font::PhysicalFontFamily::UpdateCloneFontList(vcl::font::PhysicalFontCollection&) const -vcl::font::PhysicalFontFamily::UpdateDevFontList(vcl::font::PhysicalFontFaceCollection&) const vcl::getTTCoverage(std::optional<std::bitset<128ul> >&, std::optional<std::bitset<64ul> >&, unsigned char const*, unsigned long) vcl::importPdfVectorGraphicData(SvStream&, std::shared_ptr<VectorGraphicData>&) vcl::lok::unregisterPollCallbacks() @@ -19006,22 +18406,6 @@ vcl::text::ImplLayoutArgs::SetKashidaArray(unsigned char const*) vcl::text::ImplLayoutArgs::SetLayoutWidth(double) vcl::text::ImplLayoutArgs::SetOrientation(o3tl::strong_int<short, FractionTag<10> >) vcl::text::TextLayoutCache::Create(rtl::OUString const&) -vcl::unohelper::DragAndDropClient::dragDropEnd(com::sun::star::datatransfer::dnd::DragSourceDropEvent const&) -vcl::unohelper::DragAndDropClient::dragEnter(com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent const&) -vcl::unohelper::DragAndDropClient::dragExit(com::sun::star::datatransfer::dnd::DropTargetEvent const&) -vcl::unohelper::DragAndDropClient::dragGestureRecognized(com::sun::star::datatransfer::dnd::DragGestureEvent const&) -vcl::unohelper::DragAndDropClient::dragOver(com::sun::star::datatransfer::dnd::DropTargetDragEvent const&) -vcl::unohelper::DragAndDropClient::drop(com::sun::star::datatransfer::dnd::DropTargetDropEvent const&) -vcl::unohelper::HtmlTransferable::getTransferData(com::sun::star::datatransfer::DataFlavor const&) -vcl::unohelper::HtmlTransferable::getTransferDataFlavors() -vcl::unohelper::HtmlTransferable::isDataFlavorSupported(com::sun::star::datatransfer::DataFlavor const&) -vcl::unohelper::HtmlTransferable::queryInterface(com::sun::star::uno::Type const&) -vcl::unohelper::HtmlTransferable::~HtmlTransferable() -vcl::unohelper::TextDataObject::getTransferData(com::sun::star::datatransfer::DataFlavor const&) -vcl::unohelper::TextDataObject::getTransferDataFlavors() -vcl::unohelper::TextDataObject::isDataFlavorSupported(com::sun::star::datatransfer::DataFlavor const&) -vcl::unohelper::TextDataObject::queryInterface(com::sun::star::uno::Type const&) -vcl::unohelper::TextDataObject::~TextDataObject() vec_compress vec_expand verifyLink @@ -19030,8 +18414,6 @@ verifyPricer verify_basis verify_solution verify_stability -weld::AssistantController::AssistantController(weld::Widget*, rtl::OUString const&, rtl::OUString const&) -weld::AssistantController::~AssistantController() weld::CustomWidgetController::DragBeginHdl(weld::DrawingArea&) weld::MetricSpinButton::format_number(long) const weld::MetricSpinButton::spin_button_input(int*) diff --git a/include/vcl/BinaryDataContainer.hxx b/include/vcl/BinaryDataContainer.hxx index 390c3412dd98..3e5e94d5f11c 100644 --- a/include/vcl/BinaryDataContainer.hxx +++ b/include/vcl/BinaryDataContainer.hxx @@ -30,7 +30,7 @@ class VCL_DLLPUBLIC BinaryDataContainer final std::shared_ptr<Impl> mpImpl; - void ensureSwappedIn() const; + SAL_DLLPRIVATE void ensureSwappedIn() const; public: BinaryDataContainer() = default; @@ -47,24 +47,24 @@ public: size_t getSize() const; bool isEmpty() const; const sal_uInt8* getData() const; - css::uno::Sequence<sal_Int8> getCopyAsByteSequence() const; + SAL_DLLPRIVATE css::uno::Sequence<sal_Int8> getCopyAsByteSequence() const; // Returns the data as a readonly stream open for reading - std::shared_ptr<SvStream> getAsStream(); + SAL_DLLPRIVATE std::shared_ptr<SvStream> getAsStream(); // Returns the data as a readonly stream open for reading - css::uno::Reference<css::io::XInputStream> getAsXInputStream(); + SAL_DLLPRIVATE css::uno::Reference<css::io::XInputStream> getAsXInputStream(); /// writes the contents to the given stream std::size_t writeToStream(SvStream& rStream) const; /// return the in-memory size in bytes as of now. - std::size_t getSizeBytes() const; + SAL_DLLPRIVATE std::size_t getSizeBytes() const; /// swap out to disk for now - void swapOut() const; + SAL_DLLPRIVATE void swapOut() const; - size_t calculateHash() const; + SAL_DLLPRIVATE size_t calculateHash() const; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/BitmapPalette.hxx b/include/vcl/BitmapPalette.hxx index 1d5f79de5adf..41a944353606 100644 --- a/include/vcl/BitmapPalette.hxx +++ b/include/vcl/BitmapPalette.hxx @@ -39,18 +39,18 @@ public: SAL_DLLPRIVATE BitmapColor* ImplGetColorBuffer(); - BitmapChecksum GetChecksum() const; + SAL_DLLPRIVATE BitmapChecksum GetChecksum() const; BitmapPalette(); BitmapPalette( const BitmapPalette& ); - BitmapPalette( BitmapPalette&& ) noexcept; + SAL_DLLPRIVATE BitmapPalette( BitmapPalette&& ) noexcept; BitmapPalette(std::initializer_list<BitmapColor> aBitmapColor); template <size_t N> BitmapPalette(const std::array<BitmapColor, N>& colors); explicit BitmapPalette(sal_uInt16 nCount); ~BitmapPalette(); BitmapPalette& operator=( const BitmapPalette& ); - BitmapPalette& operator=( BitmapPalette&& ) noexcept; + SAL_DLLPRIVATE BitmapPalette& operator=( BitmapPalette&& ) noexcept; bool operator==( const BitmapPalette& rBitmapPalette ) const; bool operator!=(const BitmapPalette& rBitmapPalette) const @@ -71,12 +71,12 @@ public: sal_uInt16 GetBestIndex(const BitmapColor& rCol) const; /// Returns the BitmapColor (i.e. palette index) that is an exact match /// of the required color. Returns SAL_MAX_UINT16 if nothing found. - sal_uInt16 GetMatchingIndex(const BitmapColor& rCol) const; + SAL_DLLPRIVATE sal_uInt16 GetMatchingIndex(const BitmapColor& rCol) const; /// Returns true if the palette is 8-bit grey palette. bool IsGreyPalette8Bit() const; /// Returns true if the palette is a grey palette (may not be 8-bit). - bool IsGreyPaletteAny() const; + SAL_DLLPRIVATE bool IsGreyPaletteAny() const; typedef o3tl::cow_wrapper< ImplBitmapPalette > ImplType; diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx index f06f736e452c..0fa68905b139 100644 --- a/include/vcl/BitmapTools.hxx +++ b/include/vcl/BitmapTools.hxx @@ -31,11 +31,11 @@ namespace vcl::bitmap { #if !ENABLE_WASM_STRIP_PREMULTIPLY typedef std::array<std::array<sal_uInt8, 256>, 256> lookup_table; -VCL_DLLPUBLIC lookup_table const & get_premultiply_table(); -VCL_DLLPUBLIC lookup_table const & get_unpremultiply_table(); +lookup_table const & get_premultiply_table(); +lookup_table const & get_unpremultiply_table(); #endif -VCL_DLLPUBLIC sal_uInt8 unpremultiply(sal_uInt8 c, sal_uInt8 a); +sal_uInt8 unpremultiply(sal_uInt8 c, sal_uInt8 a); VCL_DLLPUBLIC sal_uInt8 premultiply(sal_uInt8 c, sal_uInt8 a); BitmapEx VCL_DLLPUBLIC loadFromName(const OUString& rFileName, const ImageLoadFlags eFlags = ImageLoadFlags::NONE); diff --git a/include/vcl/BitmapWriteAccess.hxx b/include/vcl/BitmapWriteAccess.hxx index 9027210adb50..631b097438bf 100644 --- a/include/vcl/BitmapWriteAccess.hxx +++ b/include/vcl/BitmapWriteAccess.hxx @@ -21,9 +21,10 @@ public: BitmapWriteAccess(AlphaMask& rBitmap); virtual ~BitmapWriteAccess() override; - void CopyScanline(tools::Long nY, const BitmapReadAccess& rReadAcc); - void CopyScanline(tools::Long nY, ConstScanline aSrcScanline, ScanlineFormat nSrcScanlineFormat, - sal_uInt32 nSrcScanlineSize); + SAL_DLLPRIVATE void CopyScanline(tools::Long nY, const BitmapReadAccess& rReadAcc); + SAL_DLLPRIVATE void CopyScanline(tools::Long nY, ConstScanline aSrcScanline, + ScanlineFormat nSrcScanlineFormat, + sal_uInt32 nSrcScanlineSize); void SetPalette(const BitmapPalette& rPalette) { @@ -68,7 +69,7 @@ public: void Erase(const Color& rColor); - void DrawLine(const Point& rStart, const Point& rEnd); + SAL_DLLPRIVATE void DrawLine(const Point& rStart, const Point& rEnd); void FillRect(const tools::Rectangle& rRect); void DrawRect(const tools::Rectangle& rRect); diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx index b8e02efd1f68..f852fea96068 100644 --- a/include/vcl/EnumContext.hxx +++ b/include/vcl/EnumContext.hxx @@ -129,7 +129,7 @@ public: sal_Int32 GetCombinedContext_DI() const; Application GetApplication() const; - Application GetApplication_DI() const; + SAL_DLLPRIVATE Application GetApplication_DI() const; bool operator == (const EnumContext& rOther) const; bool operator != (const EnumContext& rOther) const; @@ -151,10 +151,10 @@ private: Application meApplication; Context meContext; - static void ProvideApplicationContainers(); - static void ProvideContextContainers(); - static void AddEntry (const OUString& rsName, const Application eApplication); - static void AddEntry (const OUString& rsName, const Context eContext); + SAL_DLLPRIVATE static void ProvideApplicationContainers(); + SAL_DLLPRIVATE static void ProvideContextContainers(); + SAL_DLLPRIVATE static void AddEntry (const OUString& rsName, const Application eApplication); + SAL_DLLPRIVATE static void AddEntry (const OUString& rsName, const Context eContext); }; diff --git a/include/vcl/animate/Animation.hxx b/include/vcl/animate/Animation.hxx index cd8c464c0525..a6ec7db4192f 100644 --- a/include/vcl/animate/Animation.hxx +++ b/include/vcl/animate/Animation.hxx @@ -37,22 +37,23 @@ public: Animation(const Animation& rAnimation); ~Animation(); - Animation& operator=(const Animation& rAnimation); - bool operator==(const Animation& rAnimation) const; + SAL_DLLPRIVATE Animation& operator=(const Animation& rAnimation); + SAL_DLLPRIVATE bool operator==(const Animation& rAnimation) const; bool operator!=(const Animation& rAnimation) const { return !(*this == rAnimation); } void Clear(); - bool Start(OutputDevice& rOutDev, const Point& rDestPt, const Size& rDestSz, - tools::Long nRendererId, OutputDevice* pFirstFrameOutDev); + SAL_DLLPRIVATE bool Start(OutputDevice& rOutDev, const Point& rDestPt, const Size& rDestSz, + tools::Long nRendererId, OutputDevice* pFirstFrameOutDev); - void Stop(const OutputDevice* pOutDev = nullptr, tools::Long nRendererId = 0); + SAL_DLLPRIVATE void Stop(const OutputDevice* pOutDev = nullptr, tools::Long nRendererId = 0); - void Draw(OutputDevice& rOutDev, const Point& rDestPt) const; - void Draw(OutputDevice& rOutDev, const Point& rDestPt, const Size& rDestSz) const; + SAL_DLLPRIVATE void Draw(OutputDevice& rOutDev, const Point& rDestPt) const; + SAL_DLLPRIVATE void Draw(OutputDevice& rOutDev, const Point& rDestPt, + const Size& rDestSz) const; bool IsInAnimation() const { return mbIsInAnimation; } - bool IsTransparent() const; + SAL_DLLPRIVATE bool IsTransparent() const; const Size& GetDisplaySizePixel() const { return maGlobalSize; } void SetDisplaySizePixel(const Size& rSize) { maGlobalSize = rSize; } @@ -62,7 +63,7 @@ public: sal_uInt32 GetLoopCount() const { return mnLoopCount; } void SetLoopCount(const sal_uInt32 nLoopCount); - void ResetLoopCount(); + SAL_DLLPRIVATE void ResetLoopCount(); void SetNotifyHdl(const Link<Animation*, void>& rLink) { maNotifyLink = rLink; } const Link<Animation*, void>& GetNotifyHdl() const { return maNotifyLink; } @@ -73,18 +74,18 @@ public: const AnimationFrame& Get(sal_uInt16 nAnimation) const; void Replace(const AnimationFrame& rNewAnimationBmp, sal_uInt16 nAnimation); - sal_uLong GetSizeBytes() const; - BitmapChecksum GetChecksum() const; + SAL_DLLPRIVATE sal_uLong GetSizeBytes() const; + SAL_DLLPRIVATE BitmapChecksum GetChecksum() const; public: - void Convert(BmpConversion eConversion); + SAL_DLLPRIVATE void Convert(BmpConversion eConversion); bool ReduceColors(sal_uInt16 nNewColorCount); bool Invert(); - void Mirror(BmpMirrorFlags nMirrorFlags); - void Adjust(short nLuminancePercent, short nContrastPercent, short nChannelRPercent, - short nChannelGPercent, short nChannelBPercent, double fGamma = 1.0, - bool bInvert = false); + SAL_DLLPRIVATE void Mirror(BmpMirrorFlags nMirrorFlags); + SAL_DLLPRIVATE void Adjust(short nLuminancePercent, short nContrastPercent, + short nChannelRPercent, short nChannelGPercent, + short nChannelBPercent, double fGamma = 1.0, bool bInvert = false); friend SvStream& ReadAnimation(SvStream& rIStream, Animation& rAnimation); friend SvStream& WriteAnimation(SvStream& rOStream, const Animation& rAnimation); diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 8ce5d9cf74fa..dbe8a364f712 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -113,7 +113,7 @@ public: Bitmap(); Bitmap( const Bitmap& rBitmap ); Bitmap( const Size& rSizePixel, vcl::PixelFormat ePixelFormat, const BitmapPalette* pPal = nullptr ); - explicit Bitmap( std::shared_ptr<SalBitmap> xSalBitmap ); + SAL_DLLPRIVATE explicit Bitmap( std::shared_ptr<SalBitmap> xSalBitmap ); ~Bitmap(); Bitmap& operator=( const Bitmap& rBitmap ); @@ -147,7 +147,7 @@ public: BitmapChecksum GetChecksum() const; - Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ) const; + SAL_DLLPRIVATE Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ) const; static const BitmapPalette& GetGreyPalette( int nEntries ); @@ -203,7 +203,7 @@ public: not only returned when the operation failed, but also if nothing had to be done, e.g. because nDX and nDY were zero. */ - bool Expand( + SAL_DLLPRIVATE bool Expand( sal_Int32 nDX, sal_Int32 nDY, const Color* pInitColor = nullptr ); @@ -229,7 +229,7 @@ public: nothing had to be done, e.g. because one of the rectangles are empty. */ - bool CopyPixel( + SAL_DLLPRIVATE bool CopyPixel( const tools::Rectangle& rRectDst, const tools::Rectangle& rRectSrc, const Bitmap& rBmpSrc ); @@ -251,16 +251,16 @@ public: nothing had to be done, e.g. because one of the rectangles are empty. */ - bool CopyPixel( + SAL_DLLPRIVATE bool CopyPixel( const tools::Rectangle& rRectDst, const tools::Rectangle& rRectSrc ); - bool CopyPixel_AlphaOptimized( + SAL_DLLPRIVATE bool CopyPixel_AlphaOptimized( const tools::Rectangle& rRectDst, const tools::Rectangle& rRectSrc, const AlphaMask& rBmpSrc ); - bool CopyPixel_AlphaOptimized( + SAL_DLLPRIVATE bool CopyPixel_AlphaOptimized( const tools::Rectangle& rRectDst, const tools::Rectangle& rRectSrc ); @@ -280,7 +280,7 @@ public: @return true, if blending was successful, false otherwise */ - bool Blend( + SAL_DLLPRIVATE bool Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ); @@ -346,7 +346,7 @@ public: // Adapt the BitCount of rNew to BitCount of total, including grey or color palette // Can be used to create alpha/mask bitmaps after their processing in 24bit - void AdaptBitCount(Bitmap& rNew) const; + SAL_DLLPRIVATE void AdaptBitCount(Bitmap& rNew) const; /** Rotate bitmap by the specified angle @@ -361,7 +361,7 @@ public: @return true, if the operation was completed successfully. */ - bool Rotate( Degree10 nAngle10, const Color& rFillColor ); + SAL_DLLPRIVATE bool Rotate( Degree10 nAngle10, const Color& rFillColor ); /** Create on-off mask from bitmap @@ -436,7 +436,7 @@ public: @return the generated region. */ - vcl::Region CreateRegion( const Color& rColor, const tools::Rectangle& rRect ) const; + SAL_DLLPRIVATE vcl::Region CreateRegion( const Color& rColor, const tools::Rectangle& rRect ) const; /** Merge bitmap with given background color according to specified alpha mask @@ -448,7 +448,7 @@ public: @return true, if the operation was completed successfully. */ - bool Replace( const AlphaMask& rAlpha, const Color& rMergeColor ); + SAL_DLLPRIVATE bool Replace( const AlphaMask& rAlpha, const Color& rMergeColor ); /** Replace all pixel where the given mask/alpha layer is on with the specified color @@ -460,7 +460,7 @@ public: @return true, if the operation was completed successfully. */ - bool ReplaceMask( const AlphaMask& rMask, const Color& rReplaceColor ); + SAL_DLLPRIVATE bool ReplaceMask( const AlphaMask& rMask, const Color& rReplaceColor ); /** Replace all pixel having the search color with the specified color @@ -477,7 +477,7 @@ public: @return true, if the operation was completed successfully. */ - bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol = 0 ); + SAL_DLLPRIVATE bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @@ -497,7 +497,7 @@ public: @return true, if the operation was completed successfully. */ - bool Replace( + SAL_DLLPRIVATE bool Replace( const Color* pSearchColors, const Color* rReplaceColors, size_t nColorCount, @@ -553,7 +553,7 @@ public: @return true, if the operation was completed successfully. */ - bool Adjust( + SAL_DLLPRIVATE bool Adjust( short nLuminancePercent, short nContrastPercent = 0, short nChannelRPercent = 0, @@ -587,7 +587,7 @@ public: const AlphaMask& rAlphaMask); // access to SystemDependentDataHolder, to support overload in derived class(es) - const basegfx::SystemDependentDataHolder* accessSystemDependentDataHolder() const; + SAL_DLLPRIVATE const basegfx::SystemDependentDataHolder* accessSystemDependentDataHolder() const; public: /** ReassignWithSize and recalculate bitmap. diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index de5d36ddad0f..aa2684d14b22 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -55,10 +55,10 @@ public: bool IsEmpty() const; void SetEmpty(); - void Clear(); - void ClearAlpha(); + SAL_DLLPRIVATE void Clear(); + SAL_DLLPRIVATE void ClearAlpha(); - void Draw( OutputDevice* pOutDev, + SAL_DLLPRIVATE void Draw( OutputDevice* pOutDev, const Point& rDestPt ) const; void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize ) const; @@ -71,7 +71,7 @@ public: const AlphaMask & GetAlphaMask() const { return maAlphaMask; } const Size& GetSizePixel() const { return maBitmapSize; } - void SetSizePixel(const Size& rNewSize); + SAL_DLLPRIVATE void SetSizePixel(const Size& rNewSize); const Size& GetPrefSize() const { return maBitmap.GetPrefSize(); } void SetPrefSize( const Size& rPrefSize ) { maBitmap.SetPrefSize( rPrefSize ); } @@ -251,7 +251,7 @@ public: rSearchColor and the individual pixel values, such that the corresponding pixel is still regarded a match. */ - void Replace( + SAL_DLLPRIVATE void Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTolerance ); @@ -412,7 +412,7 @@ public: @return The transformed bitmap */ [[nodiscard]] - BitmapEx getTransformed( + SAL_DLLPRIVATE BitmapEx getTransformed( const basegfx::B2DHomMatrix& rTransformation, const basegfx::B2DRange& rVisibleRange, double fMaximumArea) const; @@ -433,9 +433,9 @@ public: const css::uno::Reference< css::rendering::XBitmapCanvas > &xBitmapCanvas, const Size &rSize ); - void ChangeColorAlpha( sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo ); + SAL_DLLPRIVATE void ChangeColorAlpha( sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo ); - void AdjustTransparency( sal_uInt8 cTrans ); + SAL_DLLPRIVATE void AdjustTransparency( sal_uInt8 cTrans ); void CombineMaskOr(Color maskColor, sal_uInt8 nTol); @@ -460,7 +460,7 @@ private: const int nHeight, const int nStride); - void loadFromIconTheme( const OUString& rIconName ); + SAL_DLLPRIVATE void loadFromIconTheme( const OUString& rIconName ); Bitmap maBitmap; AlphaMask maAlphaMask; diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index b6adf4926ed5..268c23c37c0c 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -66,7 +66,7 @@ public: public: Cursor(); - Cursor( const Cursor& rCursor ); + SAL_DLLPRIVATE Cursor( const Cursor& rCursor ); ~Cursor(); void SetStyle( sal_uInt16 nStyle ); @@ -91,19 +91,19 @@ public: void SetDirection( CursorDirection nDirection = CursorDirection::NONE ); - Cursor& operator=( const Cursor& rCursor ); - bool operator==( const Cursor& rCursor ) const; + SAL_DLLPRIVATE Cursor& operator=( const Cursor& rCursor ); + SAL_DLLPRIVATE bool operator==( const Cursor& rCursor ) const; bool operator!=( const Cursor& rCursor ) const { return !(Cursor::operator==( rCursor )); } void DrawToDevice(OutputDevice& rRenderContext); private: - void LOKNotify( vcl::Window* pWindow, const OUString& rAction ); - bool ImplPrepForDraw(const OutputDevice* pDevice, ImplCursorData& rData); - void ImplRestore(); - void ImplDoShow( bool bDrawDirect, bool bRestore ); - bool ImplDoHide( bool bStop ); + SAL_DLLPRIVATE void LOKNotify( vcl::Window* pWindow, const OUString& rAction ); + SAL_DLLPRIVATE bool ImplPrepForDraw(const OutputDevice* pDevice, ImplCursorData& rData); + SAL_DLLPRIVATE void ImplRestore(); + SAL_DLLPRIVATE void ImplDoShow( bool bDrawDirect, bool bRestore ); + SAL_DLLPRIVATE bool ImplDoHide( bool bStop ); }; } // namespace vcl diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index 511f2f4538a2..b7297773ebfa 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -47,21 +47,21 @@ public: // css::datatransfer::dnd::XDragGestureListener /// @throws css::uno::RuntimeException - virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ); + SAL_DLLPRIVATE virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ); // css::datatransfer::dnd::XDragSourceListener /// @throws css::uno::RuntimeException - virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde ); + SAL_DLLPRIVATE virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde ); // css::datatransfer::dnd::XDropTargetListener /// @throws css::uno::RuntimeException - virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ); + SAL_DLLPRIVATE virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ); /// @throws css::uno::RuntimeException - virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ); + SAL_DLLPRIVATE virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ); /// @throws css::uno::RuntimeException - virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ); + SAL_DLLPRIVATE virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ); /// @throws css::uno::RuntimeException - virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ); + SAL_DLLPRIVATE virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ); }; class DragAndDropWrapper final : diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 98b6e2bce8de..937a956c261e 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -69,16 +69,16 @@ class VCL_DLLPUBLIC DockingManager std::vector<std::unique_ptr<ImplDockingWindowWrapper, o3tl::default_delete<ImplDockingWindowWrapper>>> mvDockingWindows; public: - DockingManager(); - ~DockingManager(); + SAL_DLLPRIVATE DockingManager(); + SAL_DLLPRIVATE ~DockingManager(); DockingManager& operator=( DockingManager const & ) = delete; // MSVC2015 workaround DockingManager( DockingManager const & ) = delete; // MSVC2015 workaround - void AddWindow( const vcl::Window *pWin ); - void RemoveWindow( const vcl::Window *pWin ); + SAL_DLLPRIVATE void AddWindow( const vcl::Window *pWin ); + SAL_DLLPRIVATE void RemoveWindow( const vcl::Window *pWin ); - ImplDockingWindowWrapper* GetDockingWindowWrapper( const vcl::Window *pWin ); + SAL_DLLPRIVATE ImplDockingWindowWrapper* GetDockingWindowWrapper( const vcl::Window *pWin ); bool IsDockable( const vcl::Window *pWin ); bool IsFloating( const vcl::Window *pWin ); @@ -89,13 +89,13 @@ public: void Unlock( const vcl::Window *pWin ); bool IsLocked( const vcl::Window *pWin ); - void StartPopupMode( const vcl::Window *pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nPopupModeFlags ); + SAL_DLLPRIVATE void StartPopupMode( const vcl::Window *pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nPopupModeFlags ); void StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWin ); void StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWin, FloatWinPopupFlags nPopupModeFlags ); - void SetPopupModeEndHdl( const vcl::Window *pWindow, const Link<FloatingWindow*,void>& rLink ); + SAL_DLLPRIVATE void SetPopupModeEndHdl( const vcl::Window *pWindow, const Link<FloatingWindow*,void>& rLink ); - bool IsInPopupMode( const vcl::Window *pWin ); + SAL_DLLPRIVATE bool IsInPopupMode( const vcl::Window *pWin ); void EndPopupMode( const vcl::Window *pWin ); // required because those methods are not virtual in Window (!!!) and must @@ -159,22 +159,22 @@ protected: SAL_DLLPRIVATE void DoInitialLayout(); - void loadUI(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, + SAL_DLLPRIVATE void loadUI(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame); public: - bool isLayoutEnabled() const; - void setOptimalLayoutSize(); + SAL_DLLPRIVATE bool isLayoutEnabled() const; + SAL_DLLPRIVATE void setOptimalLayoutSize(); //FIXME: is it okay to make this public? void ImplStartDocking( const Point& rPos ); SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDeferredInit; } virtual void doDeferredInit(WinBits nBits); protected: - DockingWindow( WindowType nType, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle"); + SAL_DLLPRIVATE DockingWindow( WindowType nType, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle"); public: DockingWindow(vcl::Window* pParent, WinBits nStyle, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle"); - DockingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, + SAL_DLLPRIVATE DockingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle", const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~DockingWindow() override; @@ -196,7 +196,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); const Size& GetMinOutputSizePixel() const; - void SetMaxOutputSizePixel( const Size& rSize ); + SAL_DLLPRIVATE void SetMaxOutputSizePixel( const Size& rSize ); bool IsDocking() const { return mbDocking; } bool IsDockable() const { return mbDockable; } diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx index d16a775e37d4..7e9f2c5352d1 100644 --- a/include/vcl/filter/SvmReader.hxx +++ b/include/vcl/filter/SvmReader.hxx @@ -23,7 +23,7 @@ class SvStream; -class VCL_DLLPUBLIC SvmReader +class SvmReader { private: SvStream& mrStream; @@ -31,9 +31,9 @@ private: void ReadColor(::Color& rColor); public: - SvmReader(SvStream& rIStm); + VCL_DLLPUBLIC SvmReader(SvStream& rIStm); - SvStream& Read(GDIMetaFile& rMetaFile, ImplMetaReadData* pData = nullptr); + VCL_DLLPUBLIC SvStream& Read(GDIMetaFile& rMetaFile, ImplMetaReadData* pData = nullptr); rtl::Reference<MetaAction> MetaActionHandler(ImplMetaReadData* pData); rtl::Reference<MetaAction> LineColorHandler(); rtl::Reference<MetaAction> FillColorHandler(); diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx index ef8cf8c523b5..48be319b5083 100644 --- a/include/vcl/filter/SvmWriter.hxx +++ b/include/vcl/filter/SvmWriter.hxx @@ -24,7 +24,7 @@ class SvStream; -class VCL_DLLPUBLIC SvmWriter +class SvmWriter { private: SvStream& mrStream; @@ -32,10 +32,10 @@ private: void WriteColor(::Color aColor); public: - SvmWriter(SvStream& rIStm); + VCL_DLLPUBLIC SvmWriter(SvStream& rIStm); - SvStream& Write(const GDIMetaFile& rMetaFile); - static BitmapChecksum GetChecksum(const GDIMetaFile& rMetaFile); + VCL_DLLPUBLIC SvStream& Write(const GDIMetaFile& rMetaFile); + VCL_DLLPUBLIC static BitmapChecksum GetChecksum(const GDIMetaFile& rMetaFile); void MetaActionHandler(MetaAction* pAction, ImplMetaWriteData* pData); void ActionHandler(const MetaAction* pAction); void PixelHandler(const MetaPixelAction* pAction); diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx index 88f48f20053f..dce7d976ee37 100644 --- a/include/vcl/filter/pdfdocument.hxx +++ b/include/vcl/filter/pdfdocument.hxx @@ -98,41 +98,41 @@ class VCL_DLLPUBLIC PDFObjectElement final : public PDFElement bool m_bParsed; - void parseIfNecessary(); + SAL_DLLPRIVATE void parseIfNecessary(); public: PDFObjectElement(PDFDocument& rDoc, double fObjectValue, double fGenerationValue); - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; PDFElement* Lookup(const OString& rDictionaryKey); PDFObjectElement* LookupObject(const OString& rDictionaryKey); - double GetObjectValue() const; - void SetDictionaryOffset(sal_uInt64 nDictionaryOffset); + SAL_DLLPRIVATE double GetObjectValue() const; + SAL_DLLPRIVATE void SetDictionaryOffset(sal_uInt64 nDictionaryOffset); sal_uInt64 GetDictionaryOffset(); - void SetDictionaryLength(sal_uInt64 nDictionaryLength); + SAL_DLLPRIVATE void SetDictionaryLength(sal_uInt64 nDictionaryLength); sal_uInt64 GetDictionaryLength(); PDFDictionaryElement* GetDictionary(); - void SetDictionary(PDFDictionaryElement* pDictionaryElement); - void SetNumberElement(PDFNumberElement* pNumberElement); - PDFNumberElement* GetNumberElement() const; + SAL_DLLPRIVATE void SetDictionary(PDFDictionaryElement* pDictionaryElement); + SAL_DLLPRIVATE void SetNumberElement(PDFNumberElement* pNumberElement); + SAL_DLLPRIVATE PDFNumberElement* GetNumberElement() const; /// Get access to the parsed key-value items from the object dictionary. const std::map<OString, PDFElement*>& GetDictionaryItems(); - const std::vector<PDFReferenceElement*>& GetDictionaryReferences() const; - void AddDictionaryReference(PDFReferenceElement* pReference); - void SetArray(PDFArrayElement* pArrayElement); - void SetStream(PDFStreamElement* pStreamElement); + SAL_DLLPRIVATE const std::vector<PDFReferenceElement*>& GetDictionaryReferences() const; + SAL_DLLPRIVATE void AddDictionaryReference(PDFReferenceElement* pReference); + SAL_DLLPRIVATE void SetArray(PDFArrayElement* pArrayElement); + SAL_DLLPRIVATE void SetStream(PDFStreamElement* pStreamElement); /// Access to the stream of the object, if it has any. PDFStreamElement* GetStream() const; - void SetArrayOffset(sal_uInt64 nArrayOffset); - sal_uInt64 GetArrayOffset() const; - void SetArrayLength(sal_uInt64 nArrayLength); - sal_uInt64 GetArrayLength() const; + SAL_DLLPRIVATE void SetArrayOffset(sal_uInt64 nArrayOffset); + SAL_DLLPRIVATE sal_uInt64 GetArrayOffset() const; + SAL_DLLPRIVATE void SetArrayLength(sal_uInt64 nArrayLength); + SAL_DLLPRIVATE sal_uInt64 GetArrayLength() const; PDFArrayElement* GetArray(); /// Parse objects stored in this object stream. - void ParseStoredObjects(); - std::vector<std::unique_ptr<PDFElement>>& GetStoredElements(); - SvMemoryStream* GetStreamBuffer() const; - void SetStreamBuffer(std::unique_ptr<SvMemoryStream>& pStreamBuffer); - PDFDocument& GetDocument(); + SAL_DLLPRIVATE void ParseStoredObjects(); + SAL_DLLPRIVATE std::vector<std::unique_ptr<PDFElement>>& GetStoredElements(); + SAL_DLLPRIVATE SvMemoryStream* GetStreamBuffer() const; + SAL_DLLPRIVATE void SetStreamBuffer(std::unique_ptr<SvMemoryStream>& pStreamBuffer); + SAL_DLLPRIVATE PDFDocument& GetDocument(); void writeString(OStringBuffer& /*rBuffer*/) override { assert(false && "not implemented"); } }; @@ -146,8 +146,8 @@ class VCL_DLLPUBLIC PDFArrayElement final : public PDFElement public: PDFArrayElement(PDFObjectElement* pObject); - bool Read(SvStream& rStream) override; - void PushBack(PDFElement* pElement); + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE void PushBack(PDFElement* pElement); const std::vector<PDFElement*>& GetElements() const; PDFElement* GetElement(size_t nIndex) const { return m_aElements[nIndex]; } @@ -177,15 +177,15 @@ class VCL_DLLPUBLIC PDFReferenceElement final : public PDFElement public: PDFReferenceElement(PDFDocument& rDoc, PDFNumberElement& rObject, PDFNumberElement const& rGeneration); - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; /// Assuming the reference points to a number object, return its value. - double LookupNumber(SvStream& rStream) const; + SAL_DLLPRIVATE double LookupNumber(SvStream& rStream) const; /// Lookup referenced object, without assuming anything about its contents. PDFObjectElement* LookupObject(); int GetObjectValue() const; int GetGenerationValue() const; - sal_uInt64 GetOffset() const; - PDFNumberElement& GetObjectElement() const; + SAL_DLLPRIVATE sal_uInt64 GetOffset() const; + SAL_DLLPRIVATE PDFNumberElement& GetObjectElement() const; void writeString(OStringBuffer& rBuffer) override { @@ -205,9 +205,9 @@ class VCL_DLLPUBLIC PDFStreamElement final : public PDFElement SvMemoryStream m_aMemory; public: - explicit PDFStreamElement(size_t nLength); - bool Read(SvStream& rStream) override; - sal_uInt64 GetOffset() const; + SAL_DLLPRIVATE explicit PDFStreamElement(size_t nLength); + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE sal_uInt64 GetOffset() const; SvMemoryStream& GetMemory(); void writeString(OStringBuffer& rBuffer) override @@ -227,10 +227,10 @@ class VCL_DLLPUBLIC PDFNameElement final : public PDFElement public: PDFNameElement(); - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; void SetValue(const OString& rValue) { m_aValue = rValue; } const OString& GetValue() const; - sal_uInt64 GetLocation() const; + SAL_DLLPRIVATE sal_uInt64 GetLocation() const; sal_uInt64 GetLength() const { return m_aValue.getLength(); } void writeString(OStringBuffer& rBuffer) override @@ -254,13 +254,13 @@ class VCL_DLLPUBLIC PDFDictionaryElement final : public PDFElement public: PDFDictionaryElement(); - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; - static PDFElement* Lookup(const std::map<OString, PDFElement*>& rDictionary, - const OString& rKey); - void SetKeyOffset(const OString& rKey, sal_uInt64 nOffset); + SAL_DLLPRIVATE static PDFElement* Lookup(const std::map<OString, PDFElement*>& rDictionary, + const OString& rKey); + SAL_DLLPRIVATE void SetKeyOffset(const OString& rKey, sal_uInt64 nOffset); sal_uInt64 GetKeyOffset(const OString& rKey) const; - void SetKeyValueLength(const OString& rKey, sal_uInt64 nLength); + SAL_DLLPRIVATE void SetKeyValueLength(const OString& rKey, sal_uInt64 nLength); sal_uInt64 GetKeyValueLength(const OString& rKey) const; const std::map<OString, PDFElement*>& GetItems() const; /// Looks up an object which is only referenced in this dictionary. @@ -347,8 +347,8 @@ class VCL_DLLPUBLIC PDFHexStringElement final : public PDFElement OString m_aValue; public: - bool Read(SvStream& rStream) override; - const OString& GetValue() const; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE const OString& GetValue() const; void writeString(OStringBuffer& rBuffer) override { @@ -364,7 +364,7 @@ class VCL_DLLPUBLIC PDFLiteralStringElement final : public PDFElement OString m_aValue; public: - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; const OString& GetValue() const; void writeString(OStringBuffer& rBuffer) override @@ -386,12 +386,12 @@ class VCL_DLLPUBLIC PDFNumberElement final : public PDFElement public: PDFNumberElement(); - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; double GetValue() const; void SetValue(double fValue) { m_fValue = fValue; } - sal_uInt64 GetLocation() const; - sal_uInt64 GetLength() const; + SAL_DLLPRIVATE sal_uInt64 GetLocation() const; + SAL_DLLPRIVATE sal_uInt64 GetLength() const; void writeString(OStringBuffer& rBuffer) override { rBuffer.append(m_fValue); } }; @@ -403,8 +403,8 @@ class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PDFCommentElement final : public PDFElemen OString m_aComment; public: - explicit PDFCommentElement(PDFDocument& rDoc); - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE explicit PDFCommentElement(PDFDocument& rDoc); + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; void writeString(OStringBuffer& /*rBuffer*/) override {} }; @@ -416,8 +416,8 @@ class VCL_DLLPUBLIC PDFEndDictionaryElement final : public PDFElement public: PDFEndDictionaryElement(); - bool Read(SvStream& rStream) override; - sal_uInt64 GetLocation() const; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE sal_uInt64 GetLocation() const; void writeString(OStringBuffer& /*rBuffer*/) override {} }; @@ -426,7 +426,7 @@ public: class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PDFEndStreamElement final : public PDFElement { public: - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; void writeString(OStringBuffer& /*rBuffer*/) override {} }; @@ -435,7 +435,7 @@ public: class VCL_DLLPUBLIC PDFEndObjectElement final : public PDFElement { public: - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; void writeString(OStringBuffer& /*rBuffer*/) override {} }; @@ -448,8 +448,8 @@ class VCL_DLLPUBLIC PDFEndArrayElement final : public PDFElement public: PDFEndArrayElement(); - bool Read(SvStream& rStream) override; - sal_uInt64 GetOffset() const; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE sal_uInt64 GetOffset() const; void writeString(OStringBuffer& /*rBuffer*/) override {} }; @@ -465,7 +465,7 @@ public: { } - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; void writeString(OStringBuffer& rBuffer) override { @@ -477,7 +477,7 @@ public: class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PDFNullElement final : public PDFElement { public: - bool Read(SvStream& rStream) override; + SAL_DLLPRIVATE bool Read(SvStream& rStream) override; void writeString(OStringBuffer& rBuffer) override { rBuffer.append("null"); } }; @@ -520,22 +520,23 @@ class VCL_DLLPUBLIC PDFDocument final : public PDFObjectContainer size_t m_nSignaturePage = 0; /// Suggest a minimal, yet free signature ID to use for the next signature. - sal_uInt32 GetNextSignature(); + SAL_DLLPRIVATE sal_uInt32 GetNextSignature(); /// Write the signature object as part of signing. - sal_Int32 WriteSignatureObject(const OUString& rDescription, bool bAdES, - sal_uInt64& rLastByteRangeOffset, sal_Int64& rContentOffset); + SAL_DLLPRIVATE sal_Int32 WriteSignatureObject(const OUString& rDescription, bool bAdES, + sal_uInt64& rLastByteRangeOffset, + sal_Int64& rContentOffset); /// Write the appearance object as part of signing. - sal_Int32 WriteAppearanceObject(tools::Rectangle& rSignatureRectangle); + SAL_DLLPRIVATE sal_Int32 WriteAppearanceObject(tools::Rectangle& rSignatureRectangle); /// Write the annot object as part of signing. - sal_Int32 WriteAnnotObject(PDFObjectElement const& rFirstPage, sal_Int32 nSignatureId, - sal_Int32 nAppearanceId, - const tools::Rectangle& rSignatureRectangle); + SAL_DLLPRIVATE sal_Int32 WriteAnnotObject(PDFObjectElement const& rFirstPage, + sal_Int32 nSignatureId, sal_Int32 nAppearanceId, + const tools::Rectangle& rSignatureRectangle); /// Write the updated Page object as part of signing. - bool WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnotId); + SAL_DLLPRIVATE bool WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnotId); /// Write the updated Catalog object as part of signing. - bool WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& pRoot); + SAL_DLLPRIVATE bool WriteCatalogObject(sal_Int32 nAnnotId, PDFReferenceElement*& pRoot); /// Write the updated cross-references as part of signing. - void WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* pRoot); + SAL_DLLPRIVATE void WriteXRef(sal_uInt64 nXRefOffset, PDFReferenceElement const* pRoot); public: PDFDocument(); @@ -545,31 +546,32 @@ public: /// @name Low-level functions, to be used by PDFElement subclasses. //@{ /// Decode a hex dump. - static std::vector<unsigned char> DecodeHexString(PDFHexStringElement const* pElement); + SAL_DLLPRIVATE static std::vector<unsigned char> + DecodeHexString(PDFHexStringElement const* pElement); static OUString DecodeHexStringUTF16BE(PDFHexStringElement const& rElement); - static OString ReadKeyword(SvStream& rStream); - static size_t FindStartXRef(SvStream& rStream); - void ReadXRef(SvStream& rStream); - void ReadXRefStream(SvStream& rStream); - static void SkipWhitespace(SvStream& rStream); + SAL_DLLPRIVATE static OString ReadKeyword(SvStream& rStream); + SAL_DLLPRIVATE static size_t FindStartXRef(SvStream& rStream); + SAL_DLLPRIVATE void ReadXRef(SvStream& rStream); + SAL_DLLPRIVATE void ReadXRefStream(SvStream& rStream); + SAL_DLLPRIVATE static void SkipWhitespace(SvStream& rStream); /// Instead of all whitespace, just skip CR and NL characters. - static void SkipLineBreaks(SvStream& rStream); - size_t GetObjectOffset(size_t nIndex) const; + SAL_DLLPRIVATE static void SkipLineBreaks(SvStream& rStream); + SAL_DLLPRIVATE size_t GetObjectOffset(size_t nIndex) const; const std::vector<std::unique_ptr<PDFElement>>& GetElements() const; std::vector<PDFObjectElement*> GetPages(); PDFObjectElement* GetCatalog(); /// Remember the end location of an EOF token. - void PushBackEOF(size_t nOffset); + SAL_DLLPRIVATE void PushBackEOF(size_t nOffset); /// Look up object based on object number, possibly by parsing object streams. PDFObjectElement* LookupObject(size_t nObjectNumber); /// Access to the input document, even after the input stream is gone. - SvMemoryStream& GetEditBuffer(); + SAL_DLLPRIVATE SvMemoryStream& GetEditBuffer(); /// Tokenize elements from current offset. - bool Tokenize(SvStream& rStream, TokenizeMode eMode, - std::vector<std::unique_ptr<PDFElement>>& rElements, - PDFObjectElement* pObjectElement); + SAL_DLLPRIVATE bool Tokenize(SvStream& rStream, TokenizeMode eMode, + std::vector<std::unique_ptr<PDFElement>>& rElements, + PDFObjectElement* pObjectElement); /// Register an object (owned directly or indirectly by m_aElements) as a provider for a given ID. - void SetIDObject(size_t nID, PDFObjectElement* pObject); + SAL_DLLPRIVATE void SetIDObject(size_t nID, PDFObjectElement* pObject); //@} /// @name High-level functions, to be used by others. @@ -577,7 +579,7 @@ public: /// Read elements from the start of the stream till its end. bool Read(SvStream& rStream); /// Calls Read() first and if it fails it tries to fixup and then retry. - bool ReadWithPossibleFixup(SvStream& rStream); + SAL_DLLPRIVATE bool ReadWithPossibleFixup(SvStream& rStream); void SetSignatureLine(std::vector<sal_Int8>&& rSignatureLine); void SetSignaturePage(size_t nPage); /// Sign the read document with xCertificate in the edit buffer. @@ -592,11 +594,11 @@ public: //@} /// See vcl::PDFObjectContainer::createObject(). - sal_Int32 createObject() override; + SAL_DLLPRIVATE sal_Int32 createObject() override; /// See vcl::PDFObjectContainer::updateObject(). - bool updateObject(sal_Int32 n) override; + SAL_DLLPRIVATE bool updateObject(sal_Int32 n) override; /// See vcl::PDFObjectContainer::writeBuffer(). - bool writeBufferBytes(const void* pBuffer, sal_uInt64 nBytes) override; + SAL_DLLPRIVATE bool writeBufferBytes(const void* pBuffer, sal_uInt64 nBytes) override; void checkAndEnableStreamEncryption(sal_Int32 /*nObject*/) override {} void disableStreamEncryption() override {} }; diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 944b43fae22f..ae29172989e7 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -108,17 +108,17 @@ public: tools::Long GetFontHeight() const; void SetAverageFontWidth( tools::Long nWidth ); tools::Long GetAverageFontWidth() const; - const Size& GetAverageFontSize() const; - const FontFamily& GetFontFamily() const; + SAL_DLLPRIVATE const Size& GetAverageFontSize() const; + SAL_DLLPRIVATE const FontFamily& GetFontFamily() const; // tdf#127471 for corrections on EMF/WMF we need the AvgFontWidth in Windows-specific notation tools::Long GetOrCalculateAverageFontWidth() const; // Prefer LanguageTag over LanguageType - void SetLanguageTag( const LanguageTag & ); - const LanguageTag& GetLanguageTag() const; - void SetCJKContextLanguageTag( const LanguageTag& ); - const LanguageTag& GetCJKContextLanguageTag() const; + SAL_DLLPRIVATE void SetLanguageTag( const LanguageTag & ); + SAL_DLLPRIVATE const LanguageTag& GetLanguageTag() const; + SAL_DLLPRIVATE void SetCJKContextLanguageTag( const LanguageTag& ); + SAL_DLLPRIVATE const LanguageTag& GetCJKContextLanguageTag() const; void SetLanguage( LanguageType ); LanguageType GetLanguage() const; void SetCJKContextLanguage( LanguageType ); @@ -153,7 +153,7 @@ public: bool IsWordLineMode() const; void Merge( const Font& rFont ); - void GetFontAttributes( FontAttributes& rAttrs ) const; + SAL_DLLPRIVATE void GetFontAttributes( FontAttributes& rAttrs ) const; Font& operator=( const Font& ); Font& operator=( Font&& ) noexcept; @@ -161,10 +161,10 @@ public: bool operator!=( const Font& rFont ) const { return !(Font::operator==( rFont )); } bool IsSameInstance( const Font& ) const; - bool EqualIgnoreColor( const Font& ) const; + SAL_DLLPRIVATE bool EqualIgnoreColor( const Font& ) const; // Compute value usable as hash. - size_t GetHashValueIgnoreColor() const; + SAL_DLLPRIVATE size_t GetHashValueIgnoreColor() const; friend VCL_DLLPUBLIC SvStream& ::ReadFont( SvStream& rIStm, vcl::Font& ); friend VCL_DLLPUBLIC SvStream& ::WriteFont( SvStream& rOStm, const vcl::Font& ); diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx index 7bfd074f3c8b..c9482a8f2e36 100644 --- a/include/vcl/fontcharmap.hxx +++ b/include/vcl/fontcharmap.hxx @@ -42,9 +42,9 @@ public: /** A new FontCharMap is created based on passed arguments. */ - FontCharMap(bool bMicrosoftSymbolMap, std::vector<sal_UCS4> aRangeCodes); + SAL_DLLPRIVATE FontCharMap(bool bMicrosoftSymbolMap, std::vector<sal_UCS4> aRangeCodes); - virtual ~FontCharMap() override; + SAL_DLLPRIVATE virtual ~FontCharMap() override; /** Get the default font character map @@ -136,16 +136,16 @@ public: */ sal_UCS4 GetCharFromIndex( int nCharIndex ) const; - bool isMicrosoftSymbolMap() const; + SAL_DLLPRIVATE bool isMicrosoftSymbolMap() const; private: ImplFontCharMapRef mpImplFontCharMap; friend class ::OutputDevice; - int findRangeIndex( sal_UCS4 ) const; + SAL_DLLPRIVATE int findRangeIndex( sal_UCS4 ) const; - FontCharMap( ImplFontCharMapRef pIFCMap ); + SAL_DLLPRIVATE FontCharMap( ImplFontCharMapRef pIFCMap ); // prevent assignment and copy construction FontCharMap( const FontCharMap& ) = delete; diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 63bde564dcfd..d3a0c95c1b17 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -99,7 +99,7 @@ private: SAL_DLLPRIVATE bool ImplPlayWithRenderer(OutputDevice& rOut, const Point& rPos, Size rLogicDestSize); - void Linker( OutputDevice* pOut, bool bLink ); + SAL_DLLPRIVATE void Linker( OutputDevice* pOut, bool bLink ); public: GDIMetaFile(); @@ -111,14 +111,14 @@ public: bool operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); } void Clear(); - void Mirror( BmpMirrorFlags nMirrorFlags ); + SAL_DLLPRIVATE void Mirror( BmpMirrorFlags nMirrorFlags ); void Move( tools::Long nX, tools::Long nY ); // additional Move method getting specifics how to handle MapMode( MapUnit::MapPixel ) void Move( tools::Long nX, tools::Long nY, tools::Long nDPIX, tools::Long nDPIY ); void ScaleActions(double fScaleX, double fScaleY); void Scale( double fScaleX, double fScaleY ); void Scale( const Fraction& rScaleX, const Fraction& rScaleY ); - void Rotate( Degree10 nAngle10 ); + SAL_DLLPRIVATE void Rotate( Degree10 nAngle10 ); void Clip( const tools::Rectangle& ); bool HasTransparentActions() const; @@ -161,12 +161,12 @@ public: void AddAction(const rtl::Reference<MetaAction>& pAction); void AddAction(const rtl::Reference<MetaAction>& pAction, size_t nPos); - void push_back(const rtl::Reference<MetaAction>& pAction); + SAL_DLLPRIVATE void push_back(const rtl::Reference<MetaAction>& pAction); /** * @param pAction takes ownership * @param nAction the action to replace */ - void ReplaceAction( rtl::Reference<MetaAction> pAction, size_t nAction ); + SAL_DLLPRIVATE void ReplaceAction( rtl::Reference<MetaAction> pAction, size_t nAction ); MetaAction* FirstAction(); MetaAction* NextAction(); @@ -180,7 +180,7 @@ public: void SetPrefMapMode( const MapMode& rMapMode ) { m_aPrefMapMode = rMapMode; } - sal_uLong GetSizeBytes() const; + SAL_DLLPRIVATE sal_uLong GetSizeBytes() const; /// Creates an antialiased thumbnail bool CreateThumbnail(BitmapEx& rBitmapEx, diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index 2979e2277604..0f67dca52f1b 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -57,7 +57,7 @@ public: const Color& GetStartColor() const; void SetEndColor( const Color& rColor ); const Color& GetEndColor() const; - void MakeGrayscale(); + SAL_DLLPRIVATE void MakeGrayscale(); void SetAngle( Degree10 nAngle ); Degree10 GetAngle() const; @@ -88,10 +88,10 @@ public: { return !(Gradient::operator==( rGradient )); } private: - tools::Long GetMetafileSteps(tools::Rectangle const& rRect) const; + SAL_DLLPRIVATE tools::Long GetMetafileSteps(tools::Rectangle const& rRect) const; - void DrawComplexGradientToMetafile(tools::Rectangle const& rRect, GDIMetaFile& rMetaFile) const; - void DrawLinearGradientToMetafile(tools::Rectangle const& rRect, GDIMetaFile& rMetaFile) const; + SAL_DLLPRIVATE void DrawComplexGradientToMetafile(tools::Rectangle const& rRect, GDIMetaFile& rMetaFile) const; + SAL_DLLPRIVATE void DrawLinearGradientToMetafile(tools::Rectangle const& rRect, GDIMetaFile& rMetaFile) const; }; #endif // INCLUDED_VCL_GRADIENT_HXX diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index e662987b67e3..74261bb84e6f 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -89,7 +89,7 @@ public: SAL_DLLPRIVATE ImpGraphic* ImplGetImpGraphic() const { return mxImpGraphic.get(); } Graphic(); - Graphic(std::shared_ptr<GfxLink> const & rGfxLink, sal_Int32 nPageIndex = 0); + SAL_DLLPRIVATE Graphic(std::shared_ptr<GfxLink> const & rGfxLink, sal_Int32 nPageIndex = 0); Graphic( const GraphicExternalLink& rGraphicLink ); Graphic( const Graphic& rGraphic ); Graphic( Graphic&& rGraphic ) noexcept; @@ -116,7 +116,7 @@ public: bool IsTransparent() const; bool IsAlpha() const; bool IsAnimated() const; - bool IsEPS() const; + SAL_DLLPRIVATE bool IsEPS() const; bool isAvailable() const; bool makeAvailable(); @@ -162,22 +162,22 @@ public: void StopAnimation( const OutputDevice* pOutputDevice, tools::Long nExtraData ); - void SetAnimationNotifyHdl( const Link<Animation*,void>& rLink ); - Link<Animation*,void> GetAnimationNotifyHdl() const; + SAL_DLLPRIVATE void SetAnimationNotifyHdl( const Link<Animation*,void>& rLink ); + SAL_DLLPRIVATE Link<Animation*,void> GetAnimationNotifyHdl() const; - sal_uInt32 GetAnimationLoopCount() const; + SAL_DLLPRIVATE sal_uInt32 GetAnimationLoopCount() const; BitmapChecksum GetChecksum() const; OUString getOriginURL() const; void setOriginURL(OUString const & rOriginURL); - OString getUniqueID() const; + SAL_DLLPRIVATE OString getUniqueID() const; std::shared_ptr<GraphicReader>& GetReaderContext(); - void SetReaderContext( const std::shared_ptr<GraphicReader> &pReader ); - void SetDummyContext(bool value); - bool IsDummyContext() const; + SAL_DLLPRIVATE void SetReaderContext( const std::shared_ptr<GraphicReader> &pReader ); + SAL_DLLPRIVATE void SetDummyContext(bool value); + SAL_DLLPRIVATE bool IsDummyContext() const; void SetGfxLink(const std::shared_ptr<GfxLink>& rGfxLink); const std::shared_ptr<GfxLink> & GetSharedGfxLink() const; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index fd6c205bd491..bf1f64237a1f 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -134,32 +134,32 @@ class VCL_DLLPUBLIC GraphicDescriptor final GraphicMetadata aMetadata; bool bOwnStream; - void ImpConstruct(); - - bool ImpDetectBMP( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectGIF( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectJPG( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectPCD( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectPCX( SvStream& rStm ); - bool ImpDetectPNG( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectTIF( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectXBM( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectXPM( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectPBM( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectPGM( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectPPM( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectRAS( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectTGA( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectPSD( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectEPS( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectWEBP( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectDXF( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectMET( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectPCT( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectSVM( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectWMF( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectEMF( SvStream& rStm, bool bExtendedInfo ); - bool ImpDetectSVG( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE void ImpConstruct(); + + SAL_DLLPRIVATE bool ImpDetectBMP( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectGIF( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectJPG( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectPCD( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectPCX( SvStream& rStm ); + SAL_DLLPRIVATE bool ImpDetectPNG( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectTIF( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectXBM( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectXPM( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectPBM( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectPGM( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectPPM( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectRAS( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectTGA( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectPSD( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectEPS( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectWEBP( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectDXF( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectMET( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectPCT( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectSVM( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectWMF( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectEMF( SvStream& rStm, bool bExtendedInfo ); + SAL_DLLPRIVATE bool ImpDetectSVG( SvStream& rStm, bool bExtendedInfo ); GraphicDescriptor( const GraphicDescriptor& ) = delete; GraphicDescriptor& operator=( const GraphicDescriptor& ) = delete; @@ -283,7 +283,7 @@ public: /// Imports multiple graphics. /// /// The resulting graphic is added to rGraphics on success, nullptr is added on failure. - void ImportGraphics(std::vector< std::shared_ptr<Graphic> >& rGraphics, std::vector< std::unique_ptr<SvStream> > vStreams); + SAL_DLLPRIVATE void ImportGraphics(std::vector< std::shared_ptr<Graphic> >& rGraphics, std::vector< std::unique_ptr<SvStream> > vStreams); /** Tries to ensure all Graphic objects are available (Graphic::isAvailable()). Only an optimization, may @@ -295,7 +295,7 @@ public: Graphic ImportUnloadedGraphic(SvStream& rIStream, sal_uInt64 sizeLimit = 0, const Size* pSizeHint = nullptr); const ErrCode& GetLastError() const { return *mxErrorEx;} - void ResetLastError(); + SAL_DLLPRIVATE void ResetLastError(); Link<ConvertData&,bool> GetFilterCallback() const; static GraphicFilter& GetGraphicFilter(); @@ -306,43 +306,43 @@ public: ErrCode compressAsPNG(const Graphic& rGraphic, SvStream& rOutputStream); - static ErrCode readGIF(SvStream& rStream, Graphic& rGraphic, GfxLinkType& rLinkType); - static ErrCode readPNG(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, + SAL_DLLPRIVATE static ErrCode readGIF(SvStream& rStream, Graphic& rGraphic, GfxLinkType& rLinkType); + SAL_DLLPRIVATE static ErrCode readPNG(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, BinaryDataContainer & rpGraphicContent); - static ErrCode readJPEG(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, + SAL_DLLPRIVATE static ErrCode readJPEG(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, GraphicFilterImportFlags nImportFlags); - static ErrCode readSVG(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, + SAL_DLLPRIVATE static ErrCode readSVG(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, BinaryDataContainer & rpGraphicContent); - static ErrCode readXBM(SvStream & rStream, Graphic & rGraphic); - static ErrCode readXPM(SvStream & rStream, Graphic & rGraphic); - - static ErrCode readWMF_EMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, VectorGraphicDataType eType); - static ErrCode readWMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); - static ErrCode readEMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); - - static ErrCode readPDF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); - static ErrCode readTIFF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); - static ErrCode readWithTypeSerializer(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, std::u16string_view aFilterName); - static ErrCode readBMP(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); - static ErrCode readTGA(SvStream & rStream, Graphic & rGraphic); - static ErrCode readPICT(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); - static ErrCode readMET(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); - static ErrCode readRAS(SvStream & rStream, Graphic & rGraphic); - static ErrCode readPCX(SvStream & rStream, Graphic & rGraphic); - static ErrCode readEPS(SvStream & rStream, Graphic & rGraphic); - static ErrCode readPSD(SvStream & rStream, Graphic & rGraphic); - static ErrCode readPCD(SvStream & rStream, Graphic & rGraphic); - static ErrCode readPBM(SvStream & rStream, Graphic & rGraphic); - static ErrCode readDXF(SvStream & rStream, Graphic & rGraphic); - static ErrCode readWEBP(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + SAL_DLLPRIVATE static ErrCode readXBM(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readXPM(SvStream & rStream, Graphic & rGraphic); + + SAL_DLLPRIVATE static ErrCode readWMF_EMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, VectorGraphicDataType eType); + SAL_DLLPRIVATE static ErrCode readWMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + SAL_DLLPRIVATE static ErrCode readEMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + + SAL_DLLPRIVATE static ErrCode readPDF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + SAL_DLLPRIVATE static ErrCode readTIFF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + SAL_DLLPRIVATE static ErrCode readWithTypeSerializer(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, std::u16string_view aFilterName); + SAL_DLLPRIVATE static ErrCode readBMP(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + SAL_DLLPRIVATE static ErrCode readTGA(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readPICT(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + SAL_DLLPRIVATE static ErrCode readMET(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + SAL_DLLPRIVATE static ErrCode readRAS(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readPCX(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readEPS(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readPSD(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readPCD(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readPBM(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readDXF(SvStream & rStream, Graphic & rGraphic); + SAL_DLLPRIVATE static ErrCode readWEBP(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); private: OUString aFilterPath; FilterConfigCache* pConfig; - void ImplInit(); - ErrCode ImplSetError( ErrCode nError, const SvStream* pStm = nullptr ); - ErrCode ImpTestOrFindFormat( std::u16string_view rPath, SvStream& rStream, sal_uInt16& rFormat ); + SAL_DLLPRIVATE void ImplInit(); + SAL_DLLPRIVATE ErrCode ImplSetError( ErrCode nError, const SvStream* pStm = nullptr ); + SAL_DLLPRIVATE ErrCode ImpTestOrFindFormat( std::u16string_view rPath, SvStream& rStream, sal_uInt16& rFormat ); DECL_DLLPRIVATE_LINK( FilterCallback, ConvertData&, bool ); diff --git a/include/vcl/htmltransferable.hxx b/include/vcl/htmltransferable.hxx index 2b0ae4f1d05c..3c2df18893d5 100644 --- a/include/vcl/htmltransferable.hxx +++ b/include/vcl/htmltransferable.hxx @@ -34,17 +34,20 @@ private: public: HtmlTransferable(OString sData); - virtual ~HtmlTransferable() override; + SAL_DLLPRIVATE virtual ~HtmlTransferable() override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface(const css::uno::Type& rType) override; + SAL_DLLPRIVATE css::uno::Any SAL_CALL queryInterface(const css::uno::Type& rType) override; void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::datatransfer::XTransferable - css::uno::Any SAL_CALL getTransferData(const css::datatransfer::DataFlavor& aFlavor) override; - css::uno::Sequence<css::datatransfer::DataFlavor> SAL_CALL getTransferDataFlavors() override; - sal_Bool SAL_CALL isDataFlavorSupported(const css::datatransfer::DataFlavor& aFlavor) override; + SAL_DLLPRIVATE css::uno::Any SAL_CALL + getTransferData(const css::datatransfer::DataFlavor& aFlavor) override; + SAL_DLLPRIVATE css::uno::Sequence<css::datatransfer::DataFlavor> + SAL_CALL getTransferDataFlavors() override; + SAL_DLLPRIVATE sal_Bool SAL_CALL + isDataFlavorSupported(const css::datatransfer::DataFlavor& aFlavor) override; }; } // namespace vcl::unohelper diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx index 8a34ad1bf7d1..deee9acd0666 100644 --- a/include/vcl/imap.hxx +++ b/include/vcl/imap.hxx @@ -40,25 +40,25 @@ private: OUString aName; // binary saving/loading - void ImpWriteImageMap( SvStream& rOStm ) const ; - void ImpReadImageMap( SvStream& rIStm, size_t nCount ); + SAL_DLLPRIVATE void ImpWriteImageMap( SvStream& rOStm ) const ; + SAL_DLLPRIVATE void ImpReadImageMap( SvStream& rIStm, size_t nCount ); // Import/Export - void ImpWriteCERN( SvStream& rOStm ) const; - void ImpWriteNCSA( SvStream& rOStm ) const; - void ImpReadCERN( SvStream& rOStm ); - void ImpReadNCSA( SvStream& rOStm ); + SAL_DLLPRIVATE void ImpWriteCERN( SvStream& rOStm ) const; + SAL_DLLPRIVATE void ImpWriteNCSA( SvStream& rOStm ) const; + SAL_DLLPRIVATE void ImpReadCERN( SvStream& rOStm ); + SAL_DLLPRIVATE void ImpReadNCSA( SvStream& rOStm ); - void ImpReadCERNLine( std::string_view rLine ); - static Point ImpReadCERNCoords( const char** ppStr ); - static tools::Long ImpReadCERNRadius( const char** ppStr ); - static OUString ImpReadCERNURL( const char** ppStr ); + SAL_DLLPRIVATE void ImpReadCERNLine( std::string_view rLine ); + SAL_DLLPRIVATE static Point ImpReadCERNCoords( const char** ppStr ); + SAL_DLLPRIVATE static tools::Long ImpReadCERNRadius( const char** ppStr ); + SAL_DLLPRIVATE static OUString ImpReadCERNURL( const char** ppStr ); - void ImpReadNCSALine( std::string_view rLine ); - static OUString ImpReadNCSAURL( const char** ppStr ); - static Point ImpReadNCSACoords( const char** ppStr ); + SAL_DLLPRIVATE void ImpReadNCSALine( std::string_view rLine ); + SAL_DLLPRIVATE static OUString ImpReadNCSAURL( const char** ppStr ); + SAL_DLLPRIVATE static Point ImpReadNCSACoords( const char** ppStr ); - static IMapFormat ImpDetectFormat( SvStream& rIStm ); + SAL_DLLPRIVATE static IMapFormat ImpDetectFormat( SvStream& rIStm ); public: @@ -110,7 +110,7 @@ public: void Scale( const Fraction& rFractX, const Fraction& rFracY ); // Import/Export - void Write ( SvStream& rOStm ) const; + SAL_DLLPRIVATE void Write ( SvStream& rOStm ) const; void Read( SvStream& rIStm ); void Write( SvStream& rOStm, IMapFormat nFormat ) const; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 9629a5fef39d..8847348b5170 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -431,12 +431,12 @@ class VCL_DLLPUBLIC MenuBar final : public Menu SAL_DLLPRIVATE bool ImplHandleCmdEvent(const CommandEvent& rCEvent); /// Return the MenuBarWindow. - MenuBarWindow* getMenuBarWindow(); + SAL_DLLPRIVATE MenuBarWindow* getMenuBarWindow(); public: MenuBar(); - MenuBar( const MenuBar& rMenu ); - virtual ~MenuBar() override; + SAL_DLLPRIVATE MenuBar( const MenuBar& rMenu ); + SAL_DLLPRIVATE virtual ~MenuBar() override; virtual void dispose() override; MenuBar& operator =( const MenuBar& rMenu ); @@ -447,16 +447,16 @@ public: virtual void ClosePopup(Menu* pMenu) override; /// Forward the KeyInput call to the MenuBar. - virtual void MenuBarKeyInput(const KeyEvent& rEvent) override; + SAL_DLLPRIVATE virtual void MenuBarKeyInput(const KeyEvent& rEvent) override; void ShowCloseButton( bool bShow ); bool HasCloseButton() const { return mbCloseBtnVisible; } bool HasFloatButton() const { return mbFloatBtnVisible; } bool HasHideButton() const { return mbHideBtnVisible; } - void ShowButtons( bool bClose, bool bFloat, bool bHide ); + SAL_DLLPRIVATE void ShowButtons( bool bClose, bool bFloat, bool bHide ); - virtual void SelectItem(sal_uInt16 nId) override; - bool HandleMenuHighlightEvent(Menu *pMenu, sal_uInt16 nEventId) const; + SAL_DLLPRIVATE virtual void SelectItem(sal_uInt16 nId) override; + SAL_DLLPRIVATE bool HandleMenuHighlightEvent(Menu *pMenu, sal_uInt16 nEventId) const; bool HandleMenuButtonEvent(sal_uInt16 nEventId); void SetCloseButtonClickHdl( const Link<void*,void>& rLink ) { maCloseHdl = rLink; } @@ -472,20 +472,20 @@ public: // add an arbitrary button to the menubar (will appear next to closer) // passed link will be call with a MenuBarButtonCallbackArg on press // passed string will be set as tooltip - sal_uInt16 AddMenuBarButton( const Image&, const Link<MenuBarButtonCallbackArg&,bool>&, const OUString& ); + SAL_DLLPRIVATE sal_uInt16 AddMenuBarButton( const Image&, const Link<MenuBarButtonCallbackArg&,bool>&, const OUString& ); // set the highlight link for additional button with ID nId // highlight link will be called with a MenuBarButtonHighlightArg // the bHighlight member of that struct shall contain the new state - void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBarButtonCallbackArg&,bool>& ); + SAL_DLLPRIVATE void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<MenuBarButtonCallbackArg&,bool>& ); // returns the rectangle occupied by the additional button named nId // coordinates are relative to the systemwindow the menubar is attached to // if the menubar is unattached an empty rectangle is returned - tools::Rectangle GetMenuBarButtonRectPixel( sal_uInt16 nId ); - void RemoveMenuBarButton( sal_uInt16 nId ); + SAL_DLLPRIVATE tools::Rectangle GetMenuBarButtonRectPixel( sal_uInt16 nId ); + SAL_DLLPRIVATE void RemoveMenuBarButton( sal_uInt16 nId ); void LayoutChanged(); // get the height of the menubar, return the native menubar height if that is active or the vcl // one if not - int GetMenuBarHeight() const; + SAL_DLLPRIVATE int GetMenuBarHeight() const; }; inline MenuBar& MenuBar::operator=( const MenuBar& rMenu ) @@ -519,7 +519,7 @@ public: virtual bool IsMenuBar() const override { return false; } /// Close the 'pStartedFrom' menu window. - virtual void ClosePopup(Menu* pMenu) override; + SAL_DLLPRIVATE virtual void ClosePopup(Menu* pMenu) override; void SetText( const OUString& rTitle ) { diff --git a/include/vcl/menubarupdateicon.hxx b/include/vcl/menubarupdateicon.hxx index 99aea9581a4f..5610772e668f 100644 --- a/include/vcl/menubarupdateicon.hxx +++ b/include/vcl/menubarupdateicon.hxx @@ -61,24 +61,24 @@ private: DECL_DLLPRIVATE_LINK(ClickHdl, MenuBarButtonCallbackArg&, bool); DECL_DLLPRIVATE_LINK(HighlightHdl, MenuBarButtonCallbackArg&, bool); - VclPtr<BubbleWindow> GetBubbleWindow(); - void SetBubbleChanged(); + SAL_DLLPRIVATE VclPtr<BubbleWindow> GetBubbleWindow(); + SAL_DLLPRIVATE void SetBubbleChanged(); - sal_uInt16 GetIconID(MenuBar* pMenuBar) const; + SAL_DLLPRIVATE sal_uInt16 GetIconID(MenuBar* pMenuBar) const; - void AddMenuBarIcon(SystemWindow& rSysWin, bool bAddEventHdl); - void RemoveMenuBarIcon(MenuBar* pMenuBar); - void RemoveMenuBarIcons(); + SAL_DLLPRIVATE void AddMenuBarIcon(SystemWindow& rSysWin, bool bAddEventHdl); + SAL_DLLPRIVATE void RemoveMenuBarIcon(MenuBar* pMenuBar); + SAL_DLLPRIVATE void RemoveMenuBarIcons(); public: - MenuBarUpdateIconManager(); - ~MenuBarUpdateIconManager(); + SAL_DLLPRIVATE MenuBarUpdateIconManager(); + SAL_DLLPRIVATE ~MenuBarUpdateIconManager(); - void SetShowMenuIcon(bool bShowMenuIcon); - void SetShowBubble(bool bShowBubble); - void SetBubbleImage(const Image& rImage); - void SetBubbleTitle(const OUString& rTitle); - void SetBubbleText(const OUString& rText); + SAL_DLLPRIVATE void SetShowMenuIcon(bool bShowMenuIcon); + SAL_DLLPRIVATE void SetShowBubble(bool bShowBubble); + SAL_DLLPRIVATE void SetBubbleImage(const Image& rImage); + SAL_DLLPRIVATE void SetBubbleTitle(const OUString& rTitle); + SAL_DLLPRIVATE void SetBubbleText(const OUString& rText); void SetClickHdl(const Link<LinkParamNone*, void>& rHdl) { maClickHdl = rHdl; } @@ -87,7 +87,7 @@ public: const OUString& GetBubbleTitle() const { return maBubbleTitle; } const OUString& GetBubbleText() const { return maBubbleText; } - void RemoveBubbleWindow(); + SAL_DLLPRIVATE void RemoveBubbleWindow(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index 5cf1d6e23246..bc38cb227256 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -37,7 +37,7 @@ class VCL_DLLPUBLIC FontMetric : public vcl::Font public: explicit FontMetric(); FontMetric( const FontMetric& ); // TODO make this explicit - FontMetric(vcl::font::PhysicalFontFace const& rFace); + SAL_DLLPRIVATE FontMetric(vcl::font::PhysicalFontFace const& rFace); ~FontMetric() override; sal_Int32 GetAscent() const { return mnAscent; } @@ -69,14 +69,14 @@ public: bool operator!=( const FontMetric& rMetric ) const { return !operator==( rMetric ); } - bool EqualIgnoreColor( const FontMetric& ) const; + SAL_DLLPRIVATE bool EqualIgnoreColor( const FontMetric& ) const; // Compute value usable as hash. size_t GetHashValueIgnoreColor() const; private: - bool EqualNoBase( const FontMetric& ) const; - size_t GetHashValueNoBase() const; + SAL_DLLPRIVATE bool EqualNoBase( const FontMetric& ) const; + SAL_DLLPRIVATE size_t GetHashValueNoBase() const; sal_Int32 mnAscent; // Ascent sal_Int32 mnDescent; // Descent sal_Int32 mnIntLeading; // Internal Leading diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index eefb2c6028e4..e4a0b4827b5b 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -302,7 +302,7 @@ public: cairo::SurfaceSharedPtr CreateBitmapSurface(const BitmapSystemData& rData, const Size& rSize) const; /// Return native handle for underlying surface css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const; - css::uno::Any GetSystemGfxDataAny() const; + SAL_DLLPRIVATE css::uno::Any GetSystemGfxDataAny() const; void SetRefPoint(); void SetRefPoint( const Point& rRefPoint ); @@ -319,8 +319,8 @@ public: tools::Long GetOutputHeightPixel() const { return mnOutHeight; } tools::Long GetOutOffXPixel() const { return mnOutOffX; } tools::Long GetOutOffYPixel() const { return mnOutOffY; } - void SetOutOffXPixel(tools::Long nOutOffX); - void SetOutOffYPixel(tools::Long nOutOffY); + SAL_DLLPRIVATE void SetOutOffXPixel(tools::Long nOutOffX); + SAL_DLLPRIVATE void SetOutOffYPixel(tools::Long nOutOffY); Point GetOutputOffPixel() const { return Point( mnOutOffX, mnOutOffY ); } tools::Rectangle GetOutputRectPixel() const @@ -476,7 +476,7 @@ public: void Push( vcl::PushFlags nFlags = vcl::PushFlags::ALL ); void Pop(); - void ClearStack(); + SAL_DLLPRIVATE void ClearStack(); void EnableOutput( bool bEnable = true ); bool IsOutputEnabled() const { return mbOutput; } @@ -552,7 +552,7 @@ public: vcl::Region GetClipRegion() const; void SetClipRegion(); void SetClipRegion( const vcl::Region& rRegion ); - bool SelectClipRegion( const vcl::Region&, SalGraphics* pGraphics = nullptr ); + SAL_DLLPRIVATE bool SelectClipRegion( const vcl::Region&, SalGraphics* pGraphics = nullptr ); bool IsClipRegion() const { return mbClipRegion; } @@ -707,7 +707,7 @@ private: ///@} - bool DrawPolyLineDirectInternal( + SAL_DLLPRIVATE bool DrawPolyLineDirectInternal( const basegfx::B2DHomMatrix& rObjectTransform, const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth = 0.0, @@ -828,7 +828,7 @@ public: GDIMetaFile& rMtf ); #endif - void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ); + SAL_DLLPRIVATE void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ); private: @@ -848,7 +848,7 @@ public: void Erase(const tools::Rectangle& rRect); protected: - void DrawGradientWallpaper( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, const Wallpaper& rWallpaper ); + SAL_DLLPRIVATE void DrawGradientWallpaper( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, const Wallpaper& rWallpaper ); private: SAL_DLLPRIVATE void DrawWallpaper( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, const Wallpaper& rWallpaper ); @@ -873,13 +873,13 @@ public: std::vector< tools::Rectangle >* pVector = nullptr, OUString* pDisplayText = nullptr, vcl::TextLayoutCommon* _pTextLayout = nullptr ); - static void ImplDrawText( OutputDevice& rTargetDevice, const tools::Rectangle& rRect, + SAL_DLLPRIVATE static void ImplDrawText( OutputDevice& rTargetDevice, const tools::Rectangle& rRect, const OUString& rOrigStr, DrawTextFlags nStyle, std::vector< tools::Rectangle >* pVector, OUString* pDisplayText, vcl::TextLayoutCommon& _rLayout ); - void ImplDrawText( SalLayout& ); + SAL_DLLPRIVATE void ImplDrawText( SalLayout& ); - void ImplDrawTextBackground( const SalLayout& ); + SAL_DLLPRIVATE void ImplDrawTextBackground( const SalLayout& ); void DrawCtrlText( const Point& rPos, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, @@ -892,16 +892,16 @@ public: FontLineStyle eOverline, bool bUnderlineAbove = false ); - void ImplDrawTextLine( tools::Long nBaseX, tools::Long nX, tools::Long nY, double nWidth, + SAL_DLLPRIVATE void ImplDrawTextLine( tools::Long nBaseX, tools::Long nX, tools::Long nY, double nWidth, FontStrikeout eStrikeout, FontLineStyle eUnderline, FontLineStyle eOverline, bool bUnderlineAbove ); - void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontLineStyle eUnderline, + SAL_DLLPRIVATE void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontLineStyle eUnderline, FontLineStyle eOverline, bool bWordLine, bool bUnderlineAbove ); void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, tools::Long nLineWidth = 1, tools::Long nWaveHeight = 3); - bool ImplDrawRotateText( SalLayout& ); + SAL_DLLPRIVATE bool ImplDrawRotateText( SalLayout& ); tools::Rectangle GetTextRect( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle = DrawTextFlags::WordBreak, @@ -1049,7 +1049,7 @@ public: vcl::text::TextLayoutCache const* = nullptr, SalLayoutGlyphs const*const pLayoutCache = nullptr) const; - void GetCaretPositions( const OUString&, KernArray& rCaretXArray, + SAL_DLLPRIVATE void GetCaretPositions( const OUString&, KernArray& rCaretXArray, sal_Int32 nIndex, sal_Int32 nLen, const SalLayoutGlyphs* pGlyphs = nullptr ) const; void DrawStretchText( const Point& rStartPt, sal_Int32 nWidth, @@ -1179,10 +1179,10 @@ protected: virtual void ImplClearFontData(bool bNewFontLists); virtual void ImplRefreshFontData(bool bNewFontLists); - void ReleaseFontCache(); - void ReleaseFontCollection(); - void SetFontCollectionFromSVData(); - void ResetNewFontCache(); + SAL_DLLPRIVATE void ReleaseFontCache(); + SAL_DLLPRIVATE void ReleaseFontCollection(); + SAL_DLLPRIVATE void SetFontCollectionFromSVData(); + SAL_DLLPRIVATE void ResetNewFontCache(); virtual bool ImplNewFont() const; @@ -1207,7 +1207,7 @@ public: SAL_DLLPRIVATE bool ImplIsAntiparallel() const ; void ReMirror( Point &rPoint ) const; void ReMirror( tools::Rectangle &rRect ) const; - void ReMirror( vcl::Region &rRegion ) const; + SAL_DLLPRIVATE void ReMirror( vcl::Region &rRegion ) const; SAL_DLLPRIVATE bool ImplIsRecordLayout() const; virtual bool HasMirroredGraphics() const; std::unique_ptr<SalLayout> @@ -1307,7 +1307,7 @@ public: const Size& rSrcSizePixel, const BitmapEx& rBitmapEx); - void DrawBitmapEx( + SAL_DLLPRIVATE void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, @@ -1516,7 +1516,7 @@ public: void DrawMask( const Point& rDestPt, const Size& rDestSize, const Bitmap& rBitmap, const Color& rMaskColor ); - void DrawMask( const Point& rDestPt, const Size& rDestSize, + SAL_DLLPRIVATE void DrawMask( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const Bitmap& rBitmap, const Color& rMaskColor); @@ -1557,7 +1557,7 @@ public: basegfx::B2DHomMatrix GetViewTransformation() const; basegfx::B2DHomMatrix GetInverseViewTransformation() const; - basegfx::B2DHomMatrix GetViewTransformation( const MapMode& rMapMode ) const; + SAL_DLLPRIVATE basegfx::B2DHomMatrix GetViewTransformation( const MapMode& rMapMode ) const; basegfx::B2DHomMatrix GetInverseViewTransformation( const MapMode& rMapMode ) const; @@ -1596,35 +1596,35 @@ public: SAL_WARN_UNUSED_RESULT Point LogicToPixel(const Point& rLogicPt) const; SAL_WARN_UNUSED_RESULT Size LogicToPixel(const Size& rLogicSize) const; SAL_WARN_UNUSED_RESULT tools::Rectangle LogicToPixel(const tools::Rectangle& rLogicRect) const; - SAL_WARN_UNUSED_RESULT tools::Polygon LogicToPixel(const tools::Polygon& rLogicPoly) const; - SAL_WARN_UNUSED_RESULT tools::PolyPolygon LogicToPixel(const tools::PolyPolygon& rLogicPolyPoly) const; - SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon LogicToPixel(const basegfx::B2DPolyPolygon& rLogicPolyPoly) const; + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE tools::Polygon LogicToPixel(const tools::Polygon& rLogicPoly) const; + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE tools::PolyPolygon LogicToPixel(const tools::PolyPolygon& rLogicPolyPoly) const; + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE basegfx::B2DPolyPolygon LogicToPixel(const basegfx::B2DPolyPolygon& rLogicPolyPoly) const; SAL_WARN_UNUSED_RESULT vcl::Region LogicToPixel(const vcl::Region& rLogicRegion)const; SAL_WARN_UNUSED_RESULT Point LogicToPixel(const Point& rLogicPt, const MapMode& rMapMode) const; SAL_WARN_UNUSED_RESULT Size LogicToPixel(const Size& rLogicSize, const MapMode& rMapMode) const; SAL_WARN_UNUSED_RESULT tools::Rectangle LogicToPixel(const tools::Rectangle& rLogicRect, const MapMode& rMapMode) const; - SAL_WARN_UNUSED_RESULT tools::Polygon LogicToPixel(const tools::Polygon& rLogicPoly, + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE tools::Polygon LogicToPixel(const tools::Polygon& rLogicPoly, const MapMode& rMapMode) const; - SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon LogicToPixel(const basegfx::B2DPolyPolygon& rLogicPolyPoly, + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE basegfx::B2DPolyPolygon LogicToPixel(const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode) const; SAL_WARN_UNUSED_RESULT Point PixelToLogic(const Point& rDevicePt) const; SAL_WARN_UNUSED_RESULT Size PixelToLogic(const Size& rDeviceSize) const; SAL_WARN_UNUSED_RESULT tools::Rectangle PixelToLogic(const tools::Rectangle& rDeviceRect) const; - SAL_WARN_UNUSED_RESULT tools::Polygon PixelToLogic(const tools::Polygon& rDevicePoly) const; - SAL_WARN_UNUSED_RESULT tools::PolyPolygon PixelToLogic(const tools::PolyPolygon& rDevicePolyPoly) const; - SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly) const; + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE tools::Polygon PixelToLogic(const tools::Polygon& rDevicePoly) const; + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE tools::PolyPolygon PixelToLogic(const tools::PolyPolygon& rDevicePolyPoly) const; + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE basegfx::B2DPolyPolygon PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly) const; SAL_WARN_UNUSED_RESULT vcl::Region PixelToLogic(const vcl::Region& rDeviceRegion) const; SAL_WARN_UNUSED_RESULT Point PixelToLogic(const Point& rDevicePt, const MapMode& rMapMode) const; SAL_WARN_UNUSED_RESULT Size PixelToLogic(const Size& rDeviceSize, const MapMode& rMapMode) const; SAL_WARN_UNUSED_RESULT tools::Rectangle PixelToLogic(const tools::Rectangle& rDeviceRect, const MapMode& rMapMode) const; - SAL_WARN_UNUSED_RESULT tools::Polygon PixelToLogic(const tools::Polygon& rDevicePoly, + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE tools::Polygon PixelToLogic(const tools::Polygon& rDevicePoly, const MapMode& rMapMode) const; - SAL_WARN_UNUSED_RESULT basegfx::B2DPolygon PixelToLogic(const basegfx::B2DPolygon& rDevicePoly, + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE basegfx::B2DPolygon PixelToLogic(const basegfx::B2DPolygon& rDevicePoly, const MapMode& rMapMode) const; - SAL_WARN_UNUSED_RESULT basegfx::B2DPolyPolygon PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly, + SAL_WARN_UNUSED_RESULT SAL_DLLPRIVATE basegfx::B2DPolyPolygon PixelToLogic(const basegfx::B2DPolyPolygon& rDevicePolyPoly, const MapMode& rMapMode) const; SAL_WARN_UNUSED_RESULT Point LogicToLogic(const Point& rPtSource, @@ -1838,7 +1838,7 @@ public: /** Query the native control to determine if it was acted upon */ - bool HitTestNativeScrollbar( + SAL_DLLPRIVATE bool HitTestNativeScrollbar( ControlPart nPart, const tools::Rectangle& rControlRegion, const Point& aPos, @@ -1890,7 +1890,7 @@ public: virtual vcl::Window* GetOwnerWindow() const { return nullptr; } protected: - css::awt::DeviceInfo GetCommonDeviceInfo(Size const& aDevSize) const; + SAL_DLLPRIVATE css::awt::DeviceInfo GetCommonDeviceInfo(Size const& aDevSize) const; }; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 1d5ae1f0a7d1..b3d3b71105e1 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -371,7 +371,7 @@ public: virtual ~PrinterController(); const VclPtr<Printer>& getPrinter() const; - weld::Window* getWindow() const; + SAL_DLLPRIVATE weld::Window* getWindow() const; /** For implementations: get current job properties as changed by e.g. print dialog @@ -391,17 +391,17 @@ public: in case the property is unknown or not convertible to bool, i_bFallback is returned */ - bool getBoolProperty( const OUString& i_rPropertyName, bool i_bFallback ) const; + SAL_DLLPRIVATE bool getBoolProperty( const OUString& i_rPropertyName, bool i_bFallback ) const; /** Get an int property in case the property is unknown or not convertible to bool, i_nFallback is returned */ - sal_Int32 getIntProperty( const OUString& i_rPropertyName, sal_Int32 i_nFallback ) const; + SAL_DLLPRIVATE sal_Int32 getIntProperty( const OUString& i_rPropertyName, sal_Int32 i_nFallback ) const; /// Set a property value - can also be used to add another UI property void setValue( const OUString& i_rPropertyName, const css::uno::Any& i_rValue ); - void setValue( const css::beans::PropertyValue& i_rValue ); + SAL_DLLPRIVATE void setValue( const css::beans::PropertyValue& i_rValue ); /** @return The currently active UI options. These are the same that were passed to setUIOptions. */ const css::uno::Sequence< css::beans::PropertyValue >& @@ -415,7 +415,7 @@ public: /// Enable/disable an option; this can be used to implement dialog logic. bool isUIOptionEnabled( const OUString& rPropName ) const; - bool isUIChoiceEnabled( const OUString& rPropName, sal_Int32 nChoice ) const; + SAL_DLLPRIVATE bool isUIChoiceEnabled( const OUString& rPropName, sal_Int32 nChoice ) const; /** MakeEnabled will change the property rPropName depends on to the value @@ -424,7 +424,7 @@ public: @return The property name rPropName depends on or an empty string if no change was made. */ - OUString makeEnabled( const OUString& rPropName ); + SAL_DLLPRIVATE OUString makeEnabled( const OUString& rPropName ); /// App must override this virtual int getPageCount() const = 0; @@ -448,12 +448,12 @@ public: virtual void printPage(int i_nPage) const = 0; /// Will be called after a possible dialog has been shown and the real printjob starts - virtual void jobStarted(); - virtual void jobFinished( css::view::PrintableState ); + SAL_DLLPRIVATE virtual void jobStarted(); + SAL_DLLPRIVATE virtual void jobFinished( css::view::PrintableState ); - css::view::PrintableState getJobState() const; + SAL_DLLPRIVATE css::view::PrintableState getJobState() const; - void abortJob(); + SAL_DLLPRIVATE void abortJob(); bool isShowDialogs() const; bool isDirectPrint() const; @@ -467,12 +467,12 @@ public: int getFilteredPageCount() const; SAL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf, bool i_bMayUseCache = false ); - PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, + PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false ); void printFilteredPage( int i_nPage ); SAL_DLLPRIVATE void setPrinter( const VclPtr<Printer>& ); - void createProgressDialog(); - bool isProgressCanceled() const; + SAL_DLLPRIVATE void createProgressDialog(); + SAL_DLLPRIVATE bool isProgressCanceled() const; SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& ); SAL_DLLPRIVATE const MultiPageSetup& getMultipage() const; @@ -483,7 +483,7 @@ public: SAL_DLLPRIVATE void setPaperSizeFromUser( Size i_aUserSize ); SAL_DLLPRIVATE void setOrientationFromUser( Orientation eOrientation, bool set ); void setPrinterModified( bool i_bPapersizeFromSetup ); - bool getPrinterModified() const; + SAL_DLLPRIVATE bool getPrinterModified() const; SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); SAL_DLLPRIVATE void resetPrintArea(); diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 8d5004c18efd..fd56bf94a5b3 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -118,7 +118,7 @@ public: bool operator!=( const vcl::Region& rRegion ) const { return !(Region::operator==( rRegion )); } friend VCL_DLLPUBLIC SvStream& ReadRegion( SvStream& rIStm, vcl::Region& rRegion ); - friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const vcl::Region& rRegion ); + friend SvStream& WriteRegion( SvStream& rOStm, const vcl::Region& rRegion ); /* workaround: faster conversion for PolyPolygons * if half of the Polygons contained in rPolyPoly are actually diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 3b8ac61ca586..ce644bc2c1e2 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -209,7 +209,7 @@ enum class ToolbarIconSize class VCL_DLLPUBLIC StyleSettings { - void CopyData(); + SAL_DLLPRIVATE void CopyData(); private: std::shared_ptr<ImplStyleData> mxData; @@ -217,7 +217,7 @@ private: public: StyleSettings(); - void Set3DColors( const Color& rColor ); + SAL_DLLPRIVATE void Set3DColors( const Color& rColor ); void SetFaceColor( const Color& rColor ); const Color& GetFaceColor() const; @@ -227,7 +227,7 @@ public: Color GetSeparatorColor() const; void SetCheckedColor( const Color& rColor ); - void SetCheckedColorSpecialCase( ); + SAL_DLLPRIVATE void SetCheckedColorSpecialCase( ); const Color& GetCheckedColor() const; void SetLightColor( const Color& rColor ); @@ -243,49 +243,49 @@ public: const Color& GetDarkShadowColor() const; void SetDefaultButtonTextColor( const Color& rColor ); - const Color& GetDefaultButtonTextColor() const; + SAL_DLLPRIVATE const Color& GetDefaultButtonTextColor() const; void SetButtonTextColor( const Color& rColor ); const Color& GetButtonTextColor() const; void SetDefaultActionButtonTextColor( const Color& rColor ); - const Color& GetDefaultActionButtonTextColor() const; + SAL_DLLPRIVATE const Color& GetDefaultActionButtonTextColor() const; void SetActionButtonTextColor( const Color& rColor ); - const Color& GetActionButtonTextColor() const; + SAL_DLLPRIVATE const Color& GetActionButtonTextColor() const; void SetFlatButtonTextColor( const Color& rColor ); - const Color& GetFlatButtonTextColor() const; + SAL_DLLPRIVATE const Color& GetFlatButtonTextColor() const; void SetDefaultButtonRolloverTextColor( const Color& rColor ); - const Color& GetDefaultButtonRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetDefaultButtonRolloverTextColor() const; void SetButtonRolloverTextColor( const Color& rColor ); const Color& GetButtonRolloverTextColor() const; void SetDefaultActionButtonRolloverTextColor( const Color& rColor ); - const Color& GetDefaultActionButtonRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetDefaultActionButtonRolloverTextColor() const; void SetActionButtonRolloverTextColor( const Color& rColor ); - const Color& GetActionButtonRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetActionButtonRolloverTextColor() const; void SetFlatButtonRolloverTextColor( const Color& rColor ); - const Color& GetFlatButtonRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetFlatButtonRolloverTextColor() const; void SetDefaultButtonPressedRolloverTextColor( const Color& rColor ); - const Color& GetDefaultButtonPressedRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetDefaultButtonPressedRolloverTextColor() const; void SetButtonPressedRolloverTextColor( const Color& rColor ); - const Color& GetButtonPressedRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetButtonPressedRolloverTextColor() const; void SetDefaultActionButtonPressedRolloverTextColor( const Color& rColor ); - const Color& GetDefaultActionButtonPressedRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetDefaultActionButtonPressedRolloverTextColor() const; void SetActionButtonPressedRolloverTextColor( const Color& rColor ); - const Color& GetActionButtonPressedRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetActionButtonPressedRolloverTextColor() const; void SetFlatButtonPressedRolloverTextColor( const Color& rColor ); - const Color& GetFlatButtonPressedRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetFlatButtonPressedRolloverTextColor() const; void SetRadioCheckTextColor( const Color& rColor ); const Color& GetRadioCheckTextColor() const; @@ -366,7 +366,7 @@ public: const Color& GetMenuBarColor() const; void SetMenuBarRolloverColor( const Color& rColor ); - const Color& GetMenuBarRolloverColor() const; + SAL_DLLPRIVATE const Color& GetMenuBarRolloverColor() const; void SetMenuBorderColor( const Color& rColor ); const Color& GetMenuBorderColor() const; @@ -378,10 +378,10 @@ public: const Color& GetMenuBarTextColor() const; void SetMenuBarRolloverTextColor( const Color& rColor ); - const Color& GetMenuBarRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetMenuBarRolloverTextColor() const; void SetMenuBarHighlightTextColor( const Color& rColor ); - const Color& GetMenuBarHighlightTextColor() const; + SAL_DLLPRIVATE const Color& GetMenuBarHighlightTextColor() const; void SetMenuHighlightColor( const Color& rColor ); const Color& GetMenuHighlightColor() const; @@ -390,28 +390,28 @@ public: const Color& GetMenuHighlightTextColor() const; void SetListBoxWindowBackgroundColor( const Color& rColor ); - const Color& GetListBoxWindowBackgroundColor() const; + SAL_DLLPRIVATE const Color& GetListBoxWindowBackgroundColor() const; void SetListBoxWindowTextColor( const Color& rColor ); - const Color& GetListBoxWindowTextColor() const; + SAL_DLLPRIVATE const Color& GetListBoxWindowTextColor() const; void SetListBoxWindowHighlightColor( const Color& rColor ); - const Color& GetListBoxWindowHighlightColor() const; + SAL_DLLPRIVATE const Color& GetListBoxWindowHighlightColor() const; void SetListBoxWindowHighlightTextColor( const Color& rColor ); - const Color& GetListBoxWindowHighlightTextColor() const; + SAL_DLLPRIVATE const Color& GetListBoxWindowHighlightTextColor() const; void SetTabTextColor( const Color& rColor ); - const Color& GetTabTextColor() const; + SAL_DLLPRIVATE const Color& GetTabTextColor() const; void SetTabRolloverTextColor( const Color& rColor ); - const Color& GetTabRolloverTextColor() const; + SAL_DLLPRIVATE const Color& GetTabRolloverTextColor() const; void SetTabHighlightTextColor( const Color& rColor ); - const Color& GetTabHighlightTextColor() const; + SAL_DLLPRIVATE const Color& GetTabHighlightTextColor() const; void SetToolTextColor( const Color& rColor ); - const Color& GetToolTextColor() const; + SAL_DLLPRIVATE const Color& GetToolTextColor() const; void SetLinkColor( const Color& rColor ); const Color& GetLinkColor() const; @@ -429,7 +429,7 @@ public: const Color& GetInactiveTabColor() const; void SetAlternatingRowColor(const Color& rColor); - const Color& GetAlternatingRowColor() const; + SAL_DLLPRIVATE const Color& GetAlternatingRowColor() const; void SetHighContrastMode(bool bHighContrast ); bool GetHighContrastMode() const; @@ -440,20 +440,20 @@ public: void SetUseFontAAFromSystem(bool bUseFontAAFromSystem); bool GetUseFontAAFromSystem() const; - void SetUseFlatBorders( bool bUseFlatBorders ); - bool GetUseFlatBorders() const; + SAL_DLLPRIVATE void SetUseFlatBorders( bool bUseFlatBorders ); + SAL_DLLPRIVATE bool GetUseFlatBorders() const; - void SetUseFlatMenus( bool bUseFlatMenus ); - bool GetUseFlatMenus() const; + SAL_DLLPRIVATE void SetUseFlatMenus( bool bUseFlatMenus ); + SAL_DLLPRIVATE bool GetUseFlatMenus() const; void SetUseImagesInMenus( TriState eUseImagesInMenus ); bool GetUseImagesInMenus() const; void SetPreferredUseImagesInMenus( bool bPreferredUseImagesInMenus ); - bool GetPreferredUseImagesInMenus() const; + SAL_DLLPRIVATE bool GetPreferredUseImagesInMenus() const; void SetSkipDisabledInMenus( bool bSkipDisabledInMenus ); - bool GetSkipDisabledInMenus() const; + SAL_DLLPRIVATE bool GetSkipDisabledInMenus() const; void SetHideDisabledMenuItems( bool bHideDisabledMenuItems ); bool GetHideDisabledMenuItems() const; @@ -462,10 +462,10 @@ public: bool GetContextMenuShortcuts() const; void SetPreferredContextMenuShortcuts( bool bContextMenuShortcuts ); - bool GetPreferredContextMenuShortcuts() const; + SAL_DLLPRIVATE bool GetPreferredContextMenuShortcuts() const; void SetPrimaryButtonWarpsSlider( bool bPrimaryButtonWarpsSlider ); - bool GetPrimaryButtonWarpsSlider() const; + SAL_DLLPRIVATE bool GetPrimaryButtonWarpsSlider() const; void SetAppFont( const vcl::Font& rFont ); const vcl::Font& GetAppFont() const; @@ -500,28 +500,28 @@ public: void SetFieldFont( const vcl::Font& rFont ); const vcl::Font& GetFieldFont() const; - void SetIconFont( const vcl::Font& rFont ); - const vcl::Font& GetIconFont() const; + SAL_DLLPRIVATE void SetIconFont( const vcl::Font& rFont ); + SAL_DLLPRIVATE const vcl::Font& GetIconFont() const; void SetTabFont( const vcl::Font& rFont ); const vcl::Font& GetTabFont() const; - static sal_Int32 GetBorderSize(); + SAL_DLLPRIVATE static sal_Int32 GetBorderSize(); - void SetTitleHeight( sal_Int32 nSize ); + SAL_DLLPRIVATE void SetTitleHeight( sal_Int32 nSize ); sal_Int32 GetTitleHeight() const; - void SetFloatTitleHeight( sal_Int32 nSize ); - sal_Int32 GetFloatTitleHeight() const; + SAL_DLLPRIVATE void SetFloatTitleHeight( sal_Int32 nSize ); + SAL_DLLPRIVATE sal_Int32 GetFloatTitleHeight() const; void SetScrollBarSize( sal_Int32 nSize ); sal_Int32 GetScrollBarSize() const; void SetMinThumbSize( sal_Int32 nSize ); - sal_Int32 GetMinThumbSize() const; + SAL_DLLPRIVATE sal_Int32 GetMinThumbSize() const; - void SetSpinSize( sal_Int32 nSize ); - sal_Int32 GetSpinSize() const; + SAL_DLLPRIVATE void SetSpinSize( sal_Int32 nSize ); + SAL_DLLPRIVATE sal_Int32 GetSpinSize() const; static sal_Int32 GetSplitSize(); @@ -538,10 +538,10 @@ public: SelectionOptions GetSelectionOptions() const; void SetDisplayOptions( DisplayOptions nOptions ); - DisplayOptions GetDisplayOptions() const; + SAL_DLLPRIVATE DisplayOptions GetDisplayOptions() const; void SetAntialiasingMinPixelHeight( sal_Int32 nMinPixel ); - sal_Int32 GetAntialiasingMinPixelHeight() const; + SAL_DLLPRIVATE sal_Int32 GetAntialiasingMinPixelHeight() const; void SetOptions( StyleSettingsOptions nOptions ); StyleSettingsOptions GetOptions() const; @@ -553,7 +553,7 @@ public: void SetToolbarIconSize( ToolbarIconSize nSize ); ToolbarIconSize GetToolbarIconSize() const; - Size GetToolbarIconSizePixel() const; + SAL_DLLPRIVATE Size GetToolbarIconSizePixel() const; /** Set the icon theme to use. */ void SetIconTheme(const OUString&); @@ -586,7 +586,7 @@ public: BitmapEx const & GetPersonaHeader() const; - BitmapEx const & GetPersonaFooter() const; + SAL_DLLPRIVATE BitmapEx const & GetPersonaFooter() const; const std::optional<Color>& GetPersonaMenuBarTextColor() const; @@ -612,7 +612,7 @@ public: void SetColorValueSetColumnCount(sal_uInt16 nCount); sal_uInt16 GetColorValueSetColumnCount() const; - void SetListBoxPreviewDefaultLogicSize(Size const & rSize); + SAL_DLLPRIVATE void SetListBoxPreviewDefaultLogicSize(Size const & rSize); const Size& GetListBoxPreviewDefaultPixelSize() const; // the default LineWidth for ListBox UI previews (LineStyle, LineDash, LineStartEnd). Default is 1. @@ -696,7 +696,7 @@ namespace o3tl class VCL_DLLPUBLIC AllSettings { private: - void CopyData(); + SAL_DLLPRIVATE void CopyData(); std::shared_ptr<ImplAllSettingsData> mxData; @@ -734,11 +734,11 @@ public: SAL_DLLPRIVATE static AllSettingsFlags GetWindowUpdate() { return AllSettingsFlags::MOUSE | AllSettingsFlags::STYLE | AllSettingsFlags::MISC | AllSettingsFlags::LOCALE; } - AllSettingsFlags Update( AllSettingsFlags nFlags, const AllSettings& rSettings ); + SAL_DLLPRIVATE AllSettingsFlags Update( AllSettingsFlags nFlags, const AllSettings& rSettings ); SAL_DLLPRIVATE AllSettingsFlags GetChangeFlags( const AllSettings& rSettings ) const; - bool operator ==( const AllSettings& rSet ) const; - bool operator !=( const AllSettings& rSet ) const; + SAL_DLLPRIVATE bool operator ==( const AllSettings& rSet ) const; + SAL_DLLPRIVATE bool operator !=( const AllSettings& rSet ) const; SAL_DLLPRIVATE static void LocaleSettingsChanged( ConfigurationHints nHint ); SAL_DLLPRIVATE SvtSysLocale& GetSysLocale(); }; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 36d7eeb1fc06..dcd1374fa3f5 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -345,7 +345,7 @@ public: vcl/fpicker/test/svdem.cxx */ - virtual int Main(); + SAL_DLLPRIVATE virtual int Main(); /** Exit from the application @@ -659,7 +659,7 @@ public: @returns reference to a LocaleDataWrapper object */ - static const LocaleDataWrapper& GetAppLocaleDataWrapper(); + SAL_DLLPRIVATE static const LocaleDataWrapper& GetAppLocaleDataWrapper(); ///@} @@ -714,7 +714,7 @@ public: @see ImplCallEventListeners(VclSimpleEvent* pEvent) */ - static void ImplCallEventListenersApplicationDataChanged( void* pData ); + SAL_DLLPRIVATE static void ImplCallEventListenersApplicationDataChanged( void* pData ); /** Send event to all VCL application event listeners @@ -722,7 +722,7 @@ public: @see ImplCallEventListeners(sal_uLong nEvent, Windows* pWin, void* pData); */ - static void ImplCallEventListeners( VclSimpleEvent& rEvent ); + SAL_DLLPRIVATE static void ImplCallEventListeners( VclSimpleEvent& rEvent ); /** Handle keypress event @@ -732,7 +732,7 @@ public: @see PostKeyEvent */ - static bool HandleKey( VclEventId nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); + SAL_DLLPRIVATE static bool HandleKey( VclEventId nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send keypress event @@ -837,7 +837,7 @@ public: @returns the global instance of the SystemDependentDataManager */ - static basegfx::SystemDependentDataManager& GetSystemDependentDataManager(); + SAL_DLLPRIVATE static basegfx::SystemDependentDataManager& GetSystemDependentDataManager(); /** Get the first top-level window of the application. @@ -1028,7 +1028,7 @@ public: @see RemoveAccel */ - static bool InsertAccel( Accelerator* pAccel ); + SAL_DLLPRIVATE static bool InsertAccel( Accelerator* pAccel ); /** Remove accelerator @@ -1036,7 +1036,7 @@ public: @see InsertAccel */ - static void RemoveAccel( Accelerator const * pAccel ); + SAL_DLLPRIVATE static void RemoveAccel( Accelerator const * pAccel ); /** Get the number of reserved key codes used by the application. @@ -1215,7 +1215,7 @@ public: /** Enable software-only bitmap rendering */ - static void EnableBitmapRendering(); + SAL_DLLPRIVATE static void EnableBitmapRendering(); /** Determines if bitmap rendering is enabled diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 0de1f7c0d5a9..6fed54abf0cc 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -85,35 +85,35 @@ class VCL_DLLPUBLIC TextView final : public vcl::unohelper::DragAndDropClient TextView( const TextView& ) = delete; TextView& operator=( const TextView& ) = delete; - bool ImpIndentBlock( bool bRight ); - void ShowSelection(); - void HideSelection(); - void ShowSelection( const TextSelection& rSel ); - void ImpShowHideSelection( const TextSelection* pRange = nullptr ); + SAL_DLLPRIVATE bool ImpIndentBlock( bool bRight ); + SAL_DLLPRIVATE void ShowSelection(); + SAL_DLLPRIVATE void HideSelection(); + SAL_DLLPRIVATE void ShowSelection( const TextSelection& rSel ); + SAL_DLLPRIVATE void ImpShowHideSelection( const TextSelection* pRange = nullptr ); - TextSelection const & ImpMoveCursor( const KeyEvent& rKeyEvent ); - TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); - bool IsInSelection( const TextPaM& rPaM ) const; + SAL_DLLPRIVATE TextSelection const & ImpMoveCursor( const KeyEvent& rKeyEvent ); + SAL_DLLPRIVATE TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); + SAL_DLLPRIVATE bool IsInSelection( const TextPaM& rPaM ) const; - void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, tools::Rectangle const* pPaintArea, TextSelection const* pSelection); - void ImpPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); - void ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bEndKey ); - void ImpSetSelection( const TextSelection& rSelection ); - Point ImpGetOutputStartPos( const Point& rStartDocPos ) const; + SAL_DLLPRIVATE void ImpPaint(vcl::RenderContext& rRenderContext, const Point& rStartPos, tools::Rectangle const* pPaintArea, TextSelection const* pSelection); + SAL_DLLPRIVATE void ImpPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); + SAL_DLLPRIVATE void ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bEndKey ); + SAL_DLLPRIVATE void ImpSetSelection( const TextSelection& rSelection ); + SAL_DLLPRIVATE Point ImpGetOutputStartPos( const Point& rStartDocPos ) const; - void ImpHideDDCursor(); - void ImpShowDDCursor(); + SAL_DLLPRIVATE void ImpHideDDCursor(); + SAL_DLLPRIVATE void ImpShowDDCursor(); - bool ImplTruncateNewText( OUString& rNewText ) const; - bool ImplCheckTextLen( std::u16string_view rNewText ) const; + SAL_DLLPRIVATE bool ImplTruncateNewText( OUString& rNewText ) const; + SAL_DLLPRIVATE bool ImplCheckTextLen( std::u16string_view rNewText ) const; // DragAndDropClient - virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) override; - virtual void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) override; - virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) override; - virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override; - virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override; - virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override; + SAL_DLLPRIVATE virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) override; + SAL_DLLPRIVATE virtual void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) override; + SAL_DLLPRIVATE virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) override; + SAL_DLLPRIVATE virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) override; + SAL_DLLPRIVATE virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) override; + SAL_DLLPRIVATE virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override; using DragAndDropClient::dragEnter; using DragAndDropClient::dragExit; @@ -126,23 +126,23 @@ public: TextEngine* GetTextEngine() const; vcl::Window* GetWindow() const; - void Invalidate(); + SAL_DLLPRIVATE void Invalidate(); void Scroll( tools::Long nHorzScroll, tools::Long nVertScroll ); void ShowCursor( bool bGotoCursor = true, bool bForceVisCursor = true ); void HideCursor(); - void EnableCursor( bool bEnable ); - bool IsCursorEnabled() const; + SAL_DLLPRIVATE void EnableCursor( bool bEnable ); + SAL_DLLPRIVATE bool IsCursorEnabled() const; - const TextSelection& GetSelection() const; + SAL_DLLPRIVATE const TextSelection& GetSelection() const; TextSelection& GetSelection(); void SetSelection( const TextSelection& rNewSel ); - void SetSelection( const TextSelection& rNewSel, bool bGotoCursor ); + SAL_DLLPRIVATE void SetSelection( const TextSelection& rNewSel, bool bGotoCursor ); bool HasSelection() const; OUString GetSelected() const; - OUString GetSelected( LineEnd aSeparator ) const; + SAL_DLLPRIVATE OUString GetSelected( LineEnd aSeparator ) const; void DeleteSelected(); void InsertText( const OUString& rNew ); @@ -158,8 +158,8 @@ public: void Copy(); void Paste(); - void Copy( css::uno::Reference< css::datatransfer::clipboard::XClipboard > const & rxClipboard ); - void Paste( css::uno::Reference< css::datatransfer::clipboard::XClipboard > const & rxClipboard ); + SAL_DLLPRIVATE void Copy( css::uno::Reference< css::datatransfer::clipboard::XClipboard > const & rxClipboard ); + SAL_DLLPRIVATE void Paste( css::uno::Reference< css::datatransfer::clipboard::XClipboard > const & rxClipboard ); void Undo(); void Redo(); @@ -172,7 +172,7 @@ public: Point GetDocPos( const Point& rWindowPos ) const; Point GetWindowPos( const Point& rDocPos ) const; - void SetInsertMode( bool bInsert ); + SAL_DLLPRIVATE void SetInsertMode( bool bInsert ); bool IsInsertMode() const; void SetAutoIndentMode( bool bAutoIndent ); @@ -181,30 +181,30 @@ public: bool IsReadOnly() const; void SetAutoScroll( bool bAutoScroll ); - bool IsAutoScroll() const; + SAL_DLLPRIVATE bool IsAutoScroll() const; - void SetCursorAtPoint( const Point& rPointPixel ); - bool IsSelectionAtPoint( const Point& rPointPixel ); + SAL_DLLPRIVATE void SetCursorAtPoint( const Point& rPointPixel ); + SAL_DLLPRIVATE bool IsSelectionAtPoint( const Point& rPointPixel ); - void SetPaintSelection( bool bPaint); + SAL_DLLPRIVATE void SetPaintSelection( bool bPaint); // Moved in here from the protected part. // For 'SvtXECTextCursor' (TL). Possibly needs to be solved again differently. - TextPaM PageUp( const TextPaM& rPaM ); - TextPaM PageDown( const TextPaM& rPaM ); - TextPaM CursorUp( const TextPaM& rPaM ); - TextPaM CursorDown( const TextPaM& rPaM ); - TextPaM CursorLeft( const TextPaM& rPaM, sal_uInt16 nCharacterIteratorMode ); - TextPaM CursorRight( const TextPaM& rPaM, sal_uInt16 nCharacterIteratorMode ); - TextPaM CursorFirstWord( const TextPaM& rPaM ); - TextPaM CursorWordLeft( const TextPaM& rPaM ); - TextPaM CursorWordRight( const TextPaM& rPaM ); - TextPaM CursorStartOfLine( const TextPaM& rPaM ); - TextPaM CursorEndOfLine( const TextPaM& rPaM ); - static TextPaM CursorStartOfParagraph( const TextPaM& rPaM ); - TextPaM CursorEndOfParagraph( const TextPaM& rPaM ); - static TextPaM CursorStartOfDoc(); - TextPaM CursorEndOfDoc(); + SAL_DLLPRIVATE TextPaM PageUp( const TextPaM& rPaM ); + SAL_DLLPRIVATE TextPaM PageDown( const TextPaM& rPaM ); + SAL_DLLPRIVATE TextPaM CursorUp( const TextPaM& rPaM ); + SAL_DLLPRIVATE TextPaM CursorDown( const TextPaM& rPaM ); + SAL_DLLPRIVATE TextPaM CursorLeft( const TextPaM& rPaM, sal_uInt16 nCharacterIteratorMode ); + SAL_DLLPRIVATE TextPaM CursorRight( const TextPaM& rPaM, sal_uInt16 nCharacterIteratorMode ); + SAL_DLLPRIVATE TextPaM CursorFirstWord( const TextPaM& rPaM ); + SAL_DLLPRIVATE TextPaM CursorWordLeft( const TextPaM& rPaM ); + SAL_DLLPRIVATE TextPaM CursorWordRight( const TextPaM& rPaM ); + SAL_DLLPRIVATE TextPaM CursorStartOfLine( const TextPaM& rPaM ); + TextPaM CursorEndOfLine( const TextPaM& rPaM ); + SAL_DLLPRIVATE static TextPaM CursorStartOfParagraph( const TextPaM& rPaM ); + SAL_DLLPRIVATE TextPaM CursorEndOfParagraph( const TextPaM& rPaM ); + SAL_DLLPRIVATE static TextPaM CursorStartOfDoc(); + SAL_DLLPRIVATE TextPaM CursorEndOfDoc(); /** Returns the number in paragraph of the line in which the cursor is blinking @@ -215,7 +215,7 @@ public: void MatchGroup(); // tdf#49482: Moves the start of the PaM to the center of the textview - void CenterPaM( const TextPaM& rPaM ); + SAL_DLLPRIVATE void CenterPaM( const TextPaM& rPaM ); bool Search( const i18nutil::SearchOptions2& rSearchOptions, bool bForward ); sal_uInt16 Replace( const i18nutil::SearchOptions2& rSearchOptions, bool bAll, bool bForward ); diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index 38898bc7be26..27b49df74227 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -61,7 +61,7 @@ public: SAL_DLLPRIVATE void ImplSetSeparatorX( tools::Long nX ); protected: - explicit Button( WindowType nType ); + SAL_DLLPRIVATE explicit Button( WindowType nType ); // for drawing RadioButton or CheckButton that has Text and/or Image SAL_DLLPRIVATE void ImplDrawRadioCheck(OutputDevice* pDev, WinBits nWinStyle, SystemTextColorFlags nSystemTextColorFlags, @@ -80,24 +80,24 @@ public: const Link<Button*,void>& GetClickHdl() const { return maClickHdl; } /// Setup handler for UNO commands so that commands like .uno:Something are handled automagically by this button. - void SetCommandHandler(const OUString& aCommand, const css::uno::Reference<css::frame::XFrame>& rFrame); + SAL_DLLPRIVATE void SetCommandHandler(const OUString& aCommand, const css::uno::Reference<css::frame::XFrame>& rFrame); OUString const & GetCommand() const { return maCommand; } void SetModeImage( const Image& rImage ); - Image const & GetModeImage( ) const; - bool HasImage() const; + SAL_DLLPRIVATE Image const & GetModeImage( ) const; + SAL_DLLPRIVATE bool HasImage() const; void SetImageAlign( ImageAlign eAlign ); ImageAlign GetImageAlign() const; - DrawButtonFlags GetButtonState() const; - DrawButtonFlags& GetButtonState(); + SAL_DLLPRIVATE DrawButtonFlags GetButtonState() const; + SAL_DLLPRIVATE DrawButtonFlags& GetButtonState(); /// Set an image to use as the complete render view of a custom button, /// instead of the usual contents of a button - void SetCustomButtonImage( const Image& rImage ); - Image const & GetCustomButtonImage() const; + SAL_DLLPRIVATE void SetCustomButtonImage( const Image& rImage ); + SAL_DLLPRIVATE Image const & GetCustomButtonImage() const; - bool IsSmallSymbol() const; - void SetSmallSymbol(); + SAL_DLLPRIVATE bool IsSmallSymbol() const; + SAL_DLLPRIVATE void SetSmallSymbol(); virtual bool set_property(const OUString &rKey, const OUString &rValue) override; /// Sets the button state according to the FeatureStateEvent emitted by a Uno state change. diff --git a/include/vcl/toolkit/combobox.hxx b/include/vcl/toolkit/combobox.hxx index c7628e7321ef..89565cac8652 100644 --- a/include/vcl/toolkit/combobox.hxx +++ b/include/vcl/toolkit/combobox.hxx @@ -49,7 +49,7 @@ protected: SAL_DLLPRIVATE tools::Long getMaxWidthScrollBarAndDownButton() const; protected: - bool IsDropDownBox() const; + SAL_DLLPRIVATE bool IsDropDownBox() const; virtual void FillLayoutData() const override; @@ -65,7 +65,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void Select(); - void DoubleClick(); + SAL_DLLPRIVATE void DoubleClick(); virtual void Modify() override; @@ -75,12 +75,12 @@ public: tools::Rectangle GetDropDownPosSizePixel() const; - void AdaptDropDownLineCountToMaximum(); + SAL_DLLPRIVATE void AdaptDropDownLineCountToMaximum(); void SetDropDownLineCount( sal_uInt16 nLines ); sal_uInt16 GetDropDownLineCount() const; void EnableAutoSize( bool bAuto ); - bool IsAutoSizeEnabled() const; + SAL_DLLPRIVATE bool IsAutoSizeEnabled() const; virtual void SetText( const OUString& rStr ) override; virtual void SetText( const OUString& rStr, const Selection& rNewSelection ) override; @@ -100,11 +100,11 @@ public: bool IsInDropDown() const; void ToggleDropDown(); - void SetUserItemSize( const Size& rSz ); - void EnableUserDraw( bool bUserDraw ); - bool IsUserDrawEnabled() const; + SAL_DLLPRIVATE void SetUserItemSize( const Size& rSz ); + SAL_DLLPRIVATE void EnableUserDraw( bool bUserDraw ); + SAL_DLLPRIVATE bool IsUserDrawEnabled() const; - void DrawEntry( const UserDrawEvent& rEvt ); + SAL_DLLPRIVATE void DrawEntry( const UserDrawEvent& rEvt ); void SetBorderStyle( WindowBorderStyle nBorderStyle ); void SetHighlightColor(const Color& rColor); void SetHighlightTextColor(const Color& rColor); @@ -112,16 +112,16 @@ public: /** * Adds a new separator at the given position n. */ - void AddSeparator( sal_Int32 n ); + SAL_DLLPRIVATE void AddSeparator( sal_Int32 n ); void EnableAutocomplete( bool bEnable, bool bMatchCase = false ); bool IsAutocompleteEnabled() const; bool IsMultiSelectionEnabled() const; - void SetSelectHdl(const Link<ComboBox&,void>& rLink); - void SetEntryActivateHdl(const Link<Edit&,bool>& rLink); - void SetUserDrawHdl(const Link<UserDrawEvent*, void>& rLink); + SAL_DLLPRIVATE void SetSelectHdl(const Link<ComboBox&,void>& rLink); + SAL_DLLPRIVATE void SetEntryActivateHdl(const Link<Edit&,bool>& rLink); + SAL_DLLPRIVATE void SetUserDrawHdl(const Link<UserDrawEvent*, void>& rLink); Size CalcMinimumSize() const override; virtual Size GetOptimalSize() const override; @@ -129,12 +129,12 @@ public: Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; - void SetMRUEntries( std::u16string_view rEntries ); - OUString GetMRUEntries() const; - void SetMaxMRUCount( sal_Int32 n ); - sal_Int32 GetMaxMRUCount() const; - void SetEntryData( sal_Int32 nPos, void* pNewData ); - void* GetEntryData( sal_Int32 nPos ) const; + SAL_DLLPRIVATE void SetMRUEntries( std::u16string_view rEntries ); + SAL_DLLPRIVATE OUString GetMRUEntries() const; + SAL_DLLPRIVATE void SetMaxMRUCount( sal_Int32 n ); + SAL_DLLPRIVATE sal_Int32 GetMaxMRUCount() const; + SAL_DLLPRIVATE void SetEntryData( sal_Int32 nPos, void* pNewData ); + SAL_DLLPRIVATE void* GetEntryData( sal_Int32 nPos ) const; sal_Int32 GetTopEntry() const; @@ -152,11 +152,11 @@ public: // other route. e.g. the toolbar fontsize combobox wants to immediately // change size only if something is picked from the combobox menu, other // changes don't auto-apply until the user presses return - bool IsModifyByKeyboard() const; + SAL_DLLPRIVATE bool IsModifyByKeyboard() const; // determine if Edit::Modify was called due to the ComboBox changing the edit area // itself - bool IsSyntheticModify() const; + SAL_DLLPRIVATE bool IsSyntheticModify() const; /** checks whether a certain point lies within the bounds of @@ -180,14 +180,14 @@ public: using Control::GetIndexForPoint; tools::Long GetIndexForPoint( const Point& rPoint, sal_Int32 & rPos ) const; - void setMaxWidthChars(sal_Int32 nWidth); + SAL_DLLPRIVATE void setMaxWidthChars(sal_Int32 nWidth); - void SetWidthInChars(sal_Int32 nWidthInChars); + SAL_DLLPRIVATE void SetWidthInChars(sal_Int32 nWidthInChars); - tools::Long GetDropDownEntryHeight() const; + SAL_DLLPRIVATE tools::Long GetDropDownEntryHeight() const; // the drop down window container - ImplListBoxWindow* GetMainWindow() const; + SAL_DLLPRIVATE ImplListBoxWindow* GetMainWindow() const; virtual bool set_property(const OUString &rKey, const OUString &rValue) override; diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx index 181940b6fe79..be84069b99ca 100644 --- a/include/vcl/toolkit/edit.hxx +++ b/include/vcl/toolkit/edit.hxx @@ -137,7 +137,7 @@ protected: virtual void dragOver(const css::datatransfer::dnd::DropTargetDragEvent& dtde) override; protected: - Edit(WindowType nType); + SAL_DLLPRIVATE Edit(WindowType nType); virtual void FillLayoutData() const override; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: @@ -164,7 +164,7 @@ public: virtual void Modify(); - static bool IsCharInput( const KeyEvent& rKEvt ); + SAL_DLLPRIVATE static bool IsCharInput( const KeyEvent& rKEvt ); virtual void SetModifyFlag(); @@ -174,16 +174,16 @@ public: virtual void SetReadOnly( bool bReadOnly = true ); virtual bool IsReadOnly() const { return mbReadOnly; } - void SetInsertMode( bool bInsert ); - bool IsInsertMode() const; + SAL_DLLPRIVATE void SetInsertMode( bool bInsert ); + SAL_DLLPRIVATE bool IsInsertMode() const; virtual void SetMaxTextLen( sal_Int32 nMaxLen ); virtual sal_Int32 GetMaxTextLen() const { return mnMaxTextLen; } - void SetWidthInChars(sal_Int32 nWidthInChars); + SAL_DLLPRIVATE void SetWidthInChars(sal_Int32 nWidthInChars); sal_Int32 GetWidthInChars() const { return mnWidthInChars; } - void setMaxWidthChars(sal_Int32 nWidth); + SAL_DLLPRIVATE void setMaxWidthChars(sal_Int32 nWidth); virtual void SetSelection( const Selection& rSelection ); virtual const Selection& GetSelection() const; @@ -195,15 +195,15 @@ public: virtual void Cut(); virtual void Copy(); virtual void Paste(); - void Undo(); + SAL_DLLPRIVATE void Undo(); virtual void SetText( const OUString& rStr ) override; virtual void SetText( const OUString& rStr, const Selection& rNewSelection ); virtual OUString GetText() const override; - void SetCursorAtLast(); + SAL_DLLPRIVATE void SetCursorAtLast(); - void SetPlaceholderText( const OUString& rStr ); + SAL_DLLPRIVATE void SetPlaceholderText( const OUString& rStr ); void SaveValue() { maSaveValue = GetText(); } const OUString& GetSavedValue() const { return maSaveValue; } @@ -213,7 +213,7 @@ public: void SetActivateHdl(const Link<Edit&,bool>& rLink) { maActivateHdl = rLink; } - void SetSubEdit( Edit* pEdit ); + SAL_DLLPRIVATE void SetSubEdit( Edit* pEdit ); Edit* GetSubEdit() const { return mpSubEdit; } void SetAutocompleteHdl( const Link<Edit&,void>& rLink ) { maAutocompleteHdl = rLink; } @@ -226,9 +226,9 @@ public: sal_Int32 GetMaxVisChars() const; // shows a warning box saying "text too long, truncated" - static void ShowTruncationWarning(weld::Widget* pParent); + SAL_DLLPRIVATE static void ShowTruncationWarning(weld::Widget* pParent); - VclPtr<PopupMenu> CreatePopupMenu(); + SAL_DLLPRIVATE VclPtr<PopupMenu> CreatePopupMenu(); virtual OUString GetSurroundingText() const override; virtual Selection GetSurroundingTextSelection() const override; diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx index 5fb320a9a512..f4c410c974af 100644 --- a/include/vcl/toolkit/fixed.hxx +++ b/include/vcl/toolkit/fixed.hxx @@ -130,15 +130,15 @@ private: public: explicit FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void ApplySettings(vcl::RenderContext&) override; + SAL_DLLPRIVATE virtual void ApplySettings(vcl::RenderContext&) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; - virtual void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; - virtual void Resize() override; - virtual void StateChanged( StateChangedType nType ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + SAL_DLLPRIVATE virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; + SAL_DLLPRIVATE virtual void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; + SAL_DLLPRIVATE virtual void Resize() override; + SAL_DLLPRIVATE virtual void StateChanged( StateChangedType nType ) override; + SAL_DLLPRIVATE virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - void SetBitmap( const BitmapEx& rBitmap ); + void SetBitmap( const BitmapEx& rBitmap ); }; class VCL_DLLPUBLIC FixedImage : public Control @@ -158,24 +158,24 @@ protected: public: explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual void ApplySettings(vcl::RenderContext&) override; + SAL_DLLPRIVATE virtual void ApplySettings(vcl::RenderContext&) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; - virtual void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; - virtual void Resize() override; - virtual void StateChanged( StateChangedType nType ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual Size GetOptimalSize() const override; + SAL_DLLPRIVATE virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; + SAL_DLLPRIVATE virtual void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; + SAL_DLLPRIVATE virtual void Resize() override; + SAL_DLLPRIVATE virtual void StateChanged( StateChangedType nType ) override; + SAL_DLLPRIVATE virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + SAL_DLLPRIVATE virtual Size GetOptimalSize() const override; void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } const Image& GetModeImage( ) const { return maImage;} - virtual bool set_property(const OUString &rKey, const OUString &rValue) override; + SAL_DLLPRIVATE virtual bool set_property(const OUString &rKey, const OUString &rValue) override; - static Image loadThemeImage(const OUString &rFileName); + SAL_DLLPRIVATE static Image loadThemeImage(const OUString &rFileName); - void DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) override; + SAL_DLLPRIVATE void DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/floatwin.hxx b/include/vcl/toolkit/floatwin.hxx index f71d6641369a..f266b745375e 100644 --- a/include/vcl/toolkit/floatwin.hxx +++ b/include/vcl/toolkit/floatwin.hxx @@ -98,33 +98,33 @@ public: sal_uInt16& rArrangeIndex, Point* pLOKTwipsPos = nullptr); static AbsoluteScreenPixelPoint ImplConvertToAbsPos(vcl::Window* pReference, const Point& rPos); static AbsoluteScreenPixelRectangle ImplConvertToAbsPos(vcl::Window* pReference, const tools::Rectangle& rRect); - static tools::Rectangle ImplConvertToRelPos(vcl::Window* pReference, const AbsoluteScreenPixelRectangle& rRect); + SAL_DLLPRIVATE static tools::Rectangle ImplConvertToRelPos(vcl::Window* pReference, const AbsoluteScreenPixelRectangle& rRect); SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags nFlags, const VclPtr<vcl::Window>& xFocusId ); SAL_DLLPRIVATE AbsoluteScreenPixelRectangle ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } - virtual void doDeferredInit(WinBits nBits) override; + virtual void doDeferredInit(WinBits nBits) override; void PixelInvalidate(const tools::Rectangle* pRectangle) override; public: explicit FloatingWindow(vcl::Window* pParent, WinBits nStyle); - explicit FloatingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, + SAL_DLLPRIVATE explicit FloatingWindow(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); - virtual ~FloatingWindow() override; - virtual void dispose() override; + virtual ~FloatingWindow() override; + virtual void dispose() override; - virtual bool EventNotify( NotifyEvent& rNEvt ) override; - virtual void StateChanged( StateChangedType nType ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual void PopupModeEnd(); + virtual void PopupModeEnd(); - void SetTitleType( FloatWinTitleType nTitle ); + SAL_DLLPRIVATE void SetTitleType( FloatWinTitleType nTitle ); FloatWinTitleType GetTitleType() const { return mnTitle; } - void StartPopupMode( const tools::Rectangle& rRect, FloatWinPopupFlags nFlags ); - void StartPopupMode( ToolBox* pBox, FloatWinPopupFlags nFlags ); + SAL_DLLPRIVATE void StartPopupMode( const tools::Rectangle& rRect, FloatWinPopupFlags nFlags ); + SAL_DLLPRIVATE void StartPopupMode( ToolBox* pBox, FloatWinPopupFlags nFlags ); void EndPopupMode( FloatWinPopupEndFlags nFlags = FloatWinPopupEndFlags::NONE ); - void AddPopupModeWindow( vcl::Window* pWindow ); + SAL_DLLPRIVATE void AddPopupModeWindow( vcl::Window* pWindow ); FloatWinPopupFlags GetPopupModeFlags() const { return mnPopupModeFlags; } void SetPopupModeFlags( FloatWinPopupFlags nFlags ) { mnPopupModeFlags = nFlags; } bool IsInPopupMode() const { return mbPopupMode; } diff --git a/include/vcl/toolkit/lstbox.hxx b/include/vcl/toolkit/lstbox.hxx index 197122c254d2..9b6842c1212b 100644 --- a/include/vcl/toolkit/lstbox.hxx +++ b/include/vcl/toolkit/lstbox.hxx @@ -114,35 +114,35 @@ protected: bool IsDropDownBox() const { return mpFloatWin != nullptr; } protected: - explicit ListBox( WindowType nType ); + SAL_DLLPRIVATE explicit ListBox( WindowType nType ); - virtual void FillLayoutData() const override; + SAL_DLLPRIVATE virtual void FillLayoutData() const override; public: explicit ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); - virtual ~ListBox() override; - virtual void dispose() override; + SAL_DLLPRIVATE virtual ~ListBox() override; + SAL_DLLPRIVATE virtual void dispose() override; - virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - virtual void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; - virtual void Resize() override; - virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual void StateChanged( StateChangedType nType ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + SAL_DLLPRIVATE virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; + SAL_DLLPRIVATE virtual void Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ) override; + SAL_DLLPRIVATE virtual void Resize() override; + SAL_DLLPRIVATE virtual bool PreNotify( NotifyEvent& rNEvt ) override; + SAL_DLLPRIVATE virtual void StateChanged( StateChangedType nType ) override; + SAL_DLLPRIVATE virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void Select(); - void DoubleClick(); - virtual void GetFocus() override; - virtual void LoseFocus() override; + SAL_DLLPRIVATE void DoubleClick(); + SAL_DLLPRIVATE virtual void GetFocus() override; + SAL_DLLPRIVATE virtual void LoseFocus() override; - virtual const Wallpaper& GetDisplayBackground() const override; + SAL_DLLPRIVATE virtual const Wallpaper& GetDisplayBackground() const override; - virtual void setPosSizePixel( tools::Long nX, tools::Long nY, + SAL_DLLPRIVATE virtual void setPosSizePixel( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; tools::Rectangle GetDropDownPosSizePixel() const; - void AdaptDropDownLineCountToMaximum(); + SAL_DLLPRIVATE void AdaptDropDownLineCountToMaximum(); void SetDropDownLineCount( sal_uInt16 nLines ); sal_uInt16 GetDropDownLineCount() const; @@ -160,7 +160,7 @@ public: OUString GetEntry( sal_Int32 nPos ) const; sal_Int32 GetEntryCount() const; - void SelectEntry( std::u16string_view rStr, bool bSelect = true ); + SAL_DLLPRIVATE void SelectEntry( std::u16string_view rStr, bool bSelect = true ); void SelectEntryPos( sal_Int32 nPos, bool bSelect = true ); void SelectEntriesPos( const std::vector<sal_Int32>& rPositions, bool bSelect = true ); @@ -171,8 +171,8 @@ public: bool IsEntryPosSelected( sal_Int32 nPos ) const; void SetNoSelection(); - void SetEntryData( sal_Int32 nPos, void* pNewData ); - void* GetEntryData( sal_Int32 nPos ) const; + SAL_DLLPRIVATE void SetEntryData( sal_Int32 nPos, void* pNewData ); + SAL_DLLPRIVATE void* GetEntryData( sal_Int32 nPos ) const; /** this methods stores a combination of flags from the ListBoxEntryFlags::* defines at the given entry. @@ -182,7 +182,7 @@ public: to change the internal behaviour of the ListBox implementation for specific entries. */ - void SetEntryFlags( sal_Int32 nPos, ListBoxEntryFlags nFlags ); + SAL_DLLPRIVATE void SetEntryFlags( sal_Int32 nPos, ListBoxEntryFlags nFlags ); void SetTopEntry( sal_Int32 nPos ); sal_Int32 GetTopEntry() const; @@ -201,9 +201,9 @@ public: /** * Adds a new separator at the given position n. */ - void AddSeparator( sal_Int32 n ); + SAL_DLLPRIVATE void AddSeparator( sal_Int32 n ); - bool IsTravelSelect() const; + SAL_DLLPRIVATE bool IsTravelSelect() const; bool IsInDropDown() const; void ToggleDropDown(); @@ -219,9 +219,9 @@ public: void SetSelectHdl( const Link<ListBox&,void>& rLink ) { maSelectHdl = rLink; } - Size CalcSubEditSize() const; //size of area inside lstbox, i.e. no scrollbar/dropdown + SAL_DLLPRIVATE Size CalcSubEditSize() const; //size of area inside lstbox, i.e. no scrollbar/dropdown Size CalcMinimumSize() const; //size of lstbox area, i.e. including scrollbar/dropdown - virtual Size GetOptimalSize() const override; + SAL_DLLPRIVATE virtual Size GetOptimalSize() const override; Size CalcAdjustedSize( const Size& rPrefSize ) const; Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; @@ -249,13 +249,13 @@ public: using Control::GetIndexForPoint; tools::Long GetIndexForPoint( const Point& rPoint, sal_Int32 & rPos ) const; - void setMaxWidthChars(sal_Int32 nWidth); + SAL_DLLPRIVATE void setMaxWidthChars(sal_Int32 nWidth); - virtual bool set_property(const OUString &rKey, const OUString &rValue) override; + SAL_DLLPRIVATE virtual bool set_property(const OUString &rKey, const OUString &rValue) override; - virtual FactoryFunction GetUITestFactory() const override; + SAL_DLLPRIVATE virtual FactoryFunction GetUITestFactory() const override; - virtual void DumpAsPropertyTree(tools::JsonWriter&) override; + SAL_DLLPRIVATE virtual void DumpAsPropertyTree(tools::JsonWriter&) override; }; class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MultiListBox final : public ListBox diff --git a/include/vcl/toolkit/spinfld.hxx b/include/vcl/toolkit/spinfld.hxx index 499baa4ff5eb..b77ce924acdc 100644 --- a/include/vcl/toolkit/spinfld.hxx +++ b/include/vcl/toolkit/spinfld.hxx @@ -32,34 +32,34 @@ class VCL_DLLPUBLIC SpinField : public Edit public: explicit SpinField( vcl::Window* pParent, WinBits nWinStyle, WindowType nType = WindowType::SPINFIELD ); virtual ~SpinField() override; - virtual void dispose() override; + SAL_DLLPRIVATE virtual void dispose() override; - virtual bool ShowDropDown( bool bShow ); + SAL_DLLPRIVATE virtual bool ShowDropDown( bool bShow ); - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + SAL_DLLPRIVATE virtual void Up(); + SAL_DLLPRIVATE virtual void Down(); + SAL_DLLPRIVATE virtual void First(); + SAL_DLLPRIVATE virtual void Last(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; - virtual void MouseMove( const MouseEvent& rMEvt ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; - virtual void Draw( OutputDevice* pDev, const Point& rPos,SystemTextColorFlags nFlags ) override; - virtual void Resize() override; - virtual void StateChanged( StateChangedType nType ) override; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual bool PreNotify( NotifyEvent& rNEvt ) override; + SAL_DLLPRIVATE virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + SAL_DLLPRIVATE virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + SAL_DLLPRIVATE virtual void MouseMove( const MouseEvent& rMEvt ) override; + SAL_DLLPRIVATE virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; + SAL_DLLPRIVATE virtual void Draw( OutputDevice* pDev, const Point& rPos,SystemTextColorFlags nFlags ) override; + SAL_DLLPRIVATE virtual void Resize() override; + SAL_DLLPRIVATE virtual void StateChanged( StateChangedType nType ) override; + SAL_DLLPRIVATE virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + SAL_DLLPRIVATE virtual bool PreNotify( NotifyEvent& rNEvt ) override; void SetUpHdl( const Link<SpinField&,void>& rLink ) { maUpHdlLink = rLink; } void SetDownHdl( const Link<SpinField&,void>& rLink ) { maDownHdlLink = rLink; } - virtual Size CalcMinimumSize() const override; - virtual Size CalcMinimumSizeForText(const OUString &rString) const override; - virtual Size GetOptimalSize() const override; - virtual Size CalcSize(sal_Int32 nChars) const override; + SAL_DLLPRIVATE virtual Size CalcMinimumSize() const override; + SAL_DLLPRIVATE virtual Size CalcMinimumSizeForText(const OUString &rString) const override; + SAL_DLLPRIVATE virtual Size GetOptimalSize() const override; + SAL_DLLPRIVATE virtual Size CalcSize(sal_Int32 nChars) const override; - virtual FactoryFunction GetUITestFactory() const override; + SAL_DLLPRIVATE virtual FactoryFunction GetUITestFactory() const override; SAL_DLLPRIVATE void SetUpperEnabled(bool bEnabled); SAL_DLLPRIVATE void SetLowerEnabled(bool bEnabled); @@ -70,12 +70,12 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - virtual bool EventNotify( NotifyEvent& rNEvt ) override; + SAL_DLLPRIVATE virtual bool EventNotify( NotifyEvent& rNEvt ) override; - void EndDropDown(); + SAL_DLLPRIVATE void EndDropDown(); - virtual void FillLayoutData() const override; - tools::Rectangle * ImplFindPartRect( const Point& rPt ); + SAL_DLLPRIVATE virtual void FillLayoutData() const override; + SAL_DLLPRIVATE tools::Rectangle * ImplFindPartRect( const Point& rPt ); private: DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void ); diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx index 974338aec0be..bdd61c61ba25 100644 --- a/include/vcl/transfer.hxx +++ b/include/vcl/transfer.hxx @@ -455,14 +455,14 @@ private: void ImplConstruct(); // called by our own implementation of XDropTargetListener (DropTargetListener instance) - void ImplBeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors ); - void ImplEndDrag(); + SAL_DLLPRIVATE void ImplBeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors ); + SAL_DLLPRIVATE void ImplEndDrag(); public: // to be overridden by the application - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + SAL_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); DropTargetHelper( vcl::Window* pWindow ); DropTargetHelper( const css::uno::Reference< css::datatransfer::dnd::XDropTarget >& rxDropTarget ); diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx index b9dee333df59..5dbdda777f00 100644 --- a/include/vcl/unohelp2.hxx +++ b/include/vcl/unohelp2.hxx @@ -41,17 +41,17 @@ namespace vcl::unohelper { public: TextDataObject( OUString aText ); - virtual ~TextDataObject() override; + SAL_DLLPRIVATE virtual ~TextDataObject() override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; + SAL_DLLPRIVATE css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); } void SAL_CALL release() noexcept override { OWeakObject::release(); } // css::datatransfer::XTransferable - css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; - css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; - sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; + SAL_DLLPRIVATE css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; + SAL_DLLPRIVATE css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; + SAL_DLLPRIVATE sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; /// copies a given string to a given clipboard static void CopyStringTo( diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index c30f941c53e7..c93524e3bfd4 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -2727,9 +2727,10 @@ protected: std::unique_ptr<weld::Assistant> m_xAssistant; public: - AssistantController(weld::Widget* pParent, const OUString& rUIFile, const OUString& rDialogId); + SAL_DLLPRIVATE AssistantController(weld::Widget* pParent, const OUString& rUIFile, + const OUString& rDialogId); virtual Dialog* getDialog() override; - virtual ~AssistantController() override; + SAL_DLLPRIVATE virtual ~AssistantController() override; }; } #endif diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index cfceab59102c..c71c0891c572 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -505,7 +505,7 @@ public: SalFrame* ImplGetFrame() const; SAL_DLLPRIVATE ImplFrameData* ImplGetFrameData(); - vcl::Window* ImplGetWindow() const; ///< if this is a proxy return the client, otherwise itself + vcl::Window* ImplGetWindow() const; ///< if this is a proxy return the client, otherwise itself SAL_DLLPRIVATE ImplWinData* ImplGetWinData() const; SAL_DLLPRIVATE vcl::Window* ImplGetClientWindow() const; SAL_DLLPRIVATE vcl::Window* ImplGetDlgWindow( sal_uInt16 n, GetDlgWindowType nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = nullptr ); @@ -703,7 +703,7 @@ private: protected: // Single argument ctors shall be explicit. - explicit Window( WindowType nType ); + SAL_DLLPRIVATE explicit Window( WindowType nType ); void SetCompoundControl( bool bCompound ); @@ -739,7 +739,7 @@ public: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); virtual void PostPaint(vcl::RenderContext& rRenderContext); - void Erase(vcl::RenderContext& rRenderContext); + SAL_DLLPRIVATE void Erase(vcl::RenderContext& rRenderContext); virtual void Draw( ::OutputDevice* pDev, const Point& rPos, SystemTextColorFlags nFlags ); virtual void Move(); @@ -770,13 +770,13 @@ public: void SetStyle( WinBits nStyle ); WinBits GetStyle() const; - WinBits GetPrevStyle() const; + SAL_DLLPRIVATE WinBits GetPrevStyle() const; void SetExtendedStyle( WindowExtendedStyle nExtendedStyle ); WindowExtendedStyle GetExtendedStyle() const; void SetType( WindowType nType ); WindowType GetType() const; bool IsSystemWindow() const; - bool IsDockingWindow() const; + SAL_DLLPRIVATE bool IsDockingWindow() const; bool IsDialog() const; bool IsMenuFloatingWindow() const; bool IsToolbarFloatingWindow() const; @@ -796,7 +796,7 @@ public: void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; Size CalcWindowSize( const Size& rOutSz ) const; - Size CalcOutputSize( const Size& rWinSz ) const; + SAL_DLLPRIVATE Size CalcOutputSize( const Size& rWinSz ) const; tools::Long CalcTitleWidth() const; void EnableClipSiblings( bool bClipSiblings = true ); @@ -809,9 +809,9 @@ public: void SetPaintTransparent( bool bTransparent ); bool IsPaintTransparent() const; void SetDialogControlStart( bool bStart ); - bool IsDialogControlStart() const; + SAL_DLLPRIVATE bool IsDialogControlStart() const; void SetDialogControlFlags( DialogControlFlags nFlags ); - DialogControlFlags GetDialogControlFlags() const; + SAL_DLLPRIVATE DialogControlFlags GetDialogControlFlags() const; struct PointerState { @@ -824,20 +824,20 @@ public: void SetInputContext( const InputContext& rInputContext ); const InputContext& GetInputContext() const; void PostExtTextInputEvent(VclEventId nType, const OUString& rText); - void EndExtTextInput(); + SAL_DLLPRIVATE void EndExtTextInput(); void SetCursorRect( const tools::Rectangle* pRect = nullptr, tools::Long nExtTextInputWidth = 0 ); - const tools::Rectangle* GetCursorRect() const; - tools::Long GetCursorExtTextInputWidth() const; + SAL_DLLPRIVATE const tools::Rectangle* GetCursorRect() const; + SAL_DLLPRIVATE tools::Long GetCursorExtTextInputWidth() const; void SetCompositionCharRect( const tools::Rectangle* pRect, tools::Long nCompositionLength, bool bVertical = false ); - void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); - void NotifyAllChildren( DataChangedEvent& rDCEvt ); + SAL_DLLPRIVATE void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); + SAL_DLLPRIVATE void NotifyAllChildren( DataChangedEvent& rDCEvt ); void SetPointFont(vcl::RenderContext& rRenderContext, const vcl::Font& rFont, bool bUseRenderContextDPI = false); vcl::Font GetPointFont(vcl::RenderContext const & rRenderContext) const; void SetZoomedPointFont(vcl::RenderContext& rRenderContext, const vcl::Font& rFont); - tools::Long GetDrawPixel( ::OutputDevice const * pDev, tools::Long nPixels ) const; + SAL_DLLPRIVATE tools::Long GetDrawPixel( ::OutputDevice const * pDev, tools::Long nPixels ) const; vcl::Font GetDrawPixelFont( ::OutputDevice const * pDev ) const; void SetControlFont(); @@ -859,10 +859,10 @@ public: void ApplyControlBackground(vcl::RenderContext& rRenderContext, const Color& rDefaultColor); void SetParentClipMode( ParentClipMode nMode = ParentClipMode::NONE ); - ParentClipMode GetParentClipMode() const; + SAL_DLLPRIVATE ParentClipMode GetParentClipMode() const; - void SetWindowRegionPixel(); - void SetWindowRegionPixel( const vcl::Region& rRegion ); + SAL_DLLPRIVATE void SetWindowRegionPixel(); + SAL_DLLPRIVATE void SetWindowRegionPixel( const vcl::Region& rRegion ); vcl::Region GetWindowClipRegionPixel() const; vcl::Region GetPaintRegion() const; bool IsInPaint() const; @@ -874,7 +874,7 @@ public: void SetParent( vcl::Window* pNewParent ); vcl::Window* GetParent() const; // return the dialog we are contained in or NULL if un-contained - Dialog* GetParentDialog() const; + SAL_DLLPRIVATE Dialog* GetParentDialog() const; bool IsAncestorOf( const vcl::Window& rWindow ) const; void Show( bool bVisible = true, ShowFlags nFlags = ShowFlags::NONE ); @@ -882,14 +882,14 @@ public: bool IsVisible() const; bool IsReallyVisible() const; bool IsReallyShown() const; - bool IsInInitShow() const; + SAL_DLLPRIVATE bool IsInInitShow() const; void Enable( bool bEnable = true, bool bChild = true ); void Disable( bool bChild = true ) { Enable( false, bChild ); } bool IsEnabled() const; void EnableInput( bool bEnable = true, bool bChild = true ); - void EnableInput( bool bEnable, const vcl::Window* pExcludeWindow ); + SAL_DLLPRIVATE void EnableInput( bool bEnable, const vcl::Window* pExcludeWindow ); bool IsInputEnabled() const; /** Override <code>EnableInput</code>. This can be necessary due to other people @@ -907,7 +907,7 @@ public: @return true if window is in AlwaysEnableInput state */ - bool IsAlwaysEnableInput() const; + SAL_DLLPRIVATE bool IsAlwaysEnableInput() const; /** A window is in modal mode if one of its children or subchildren is a running modal window (a modal dialog) @@ -916,13 +916,13 @@ public: */ bool IsInModalMode() const; - void SetActivateMode( ActivateModeFlags nMode ); - ActivateModeFlags GetActivateMode() const; + SAL_DLLPRIVATE void SetActivateMode( ActivateModeFlags nMode ); + SAL_DLLPRIVATE ActivateModeFlags GetActivateMode() const; void ToTop( ToTopFlags nFlags = ToTopFlags::NONE ); void SetZOrder( vcl::Window* pRefWindow, ZOrderFlags nFlags ); - void EnableAlwaysOnTop( bool bEnable = true ); - bool IsAlwaysOnTopEnabled() const; + SAL_DLLPRIVATE void EnableAlwaysOnTop( bool bEnable = true ); + SAL_DLLPRIVATE bool IsAlwaysOnTopEnabled() const; virtual void setPosSizePixel( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight, @@ -935,7 +935,7 @@ public: const Size& rNewSize ); virtual void SetOutputSizePixel( const Size& rNewSize ); bool IsDefaultPos() const; - bool IsDefaultSize() const; + SAL_DLLPRIVATE bool IsDefaultSize() const; Point GetOffsetPixelFrom(const vcl::Window& rWindow) const; // those conversion routines might deliver different results during UI mirroring @@ -943,7 +943,7 @@ public: Point ScreenToOutputPixel( const Point& rPos ) const; // the normalized screen methods work independent from UI mirroring Point OutputToNormalizedScreenPixel( const Point& rPos ) const; - Point NormalizedScreenToOutputPixel( const Point& rPos ) const; + SAL_DLLPRIVATE Point NormalizedScreenToOutputPixel( const Point& rPos ) const; AbsoluteScreenPixelPoint OutputToAbsoluteScreenPixel( const Point& rPos ) const; Point AbsoluteScreenToOutputPixel( const AbsoluteScreenPixelPoint& rPos ) const; AbsoluteScreenPixelRectangle GetDesktopRectPixel() const; @@ -952,7 +952,7 @@ public: // window extents including border and decoration, in absolute screen coordinates AbsoluteScreenPixelRectangle GetWindowExtentsAbsolute() const; - bool IsScrollable() const; + SAL_DLLPRIVATE bool IsScrollable() const; virtual void Scroll( tools::Long nHorzScroll, tools::Long nVertScroll, ScrollFlags nFlags = ScrollFlags::NONE ); void Scroll( tools::Long nHorzScroll, tools::Long nVertScroll, @@ -977,7 +977,7 @@ public: */ virtual void PixelInvalidate(const tools::Rectangle* pRectangle); void Validate(); - bool HasPaintEvent() const; + SAL_DLLPRIVATE bool HasPaintEvent() const; void PaintImmediately(); // toggles new docking support, enabled via toolkit @@ -1005,12 +1005,12 @@ public: * doesn't. This is necessary for implementing tab stops inside floating * windows, but floating windows don't get focus from the system. */ - void SetFakeFocus( bool bFocus ); + SAL_DLLPRIVATE void SetFakeFocus( bool bFocus ); bool IsCompoundControl() const; - static VclPtr<vcl::Window> SaveFocus(); - static void EndSaveFocus(const VclPtr<vcl::Window>& xFocusWin); + SAL_DLLPRIVATE static VclPtr<vcl::Window> SaveFocus(); + SAL_DLLPRIVATE static void EndSaveFocus(const VclPtr<vcl::Window>& xFocusWin); void LocalStartDrag(); void CaptureMouse(); @@ -1022,7 +1022,7 @@ public: void EnableChildPointerOverwrite( bool bOverwrite ); void SetPointerPosPixel( const Point& rPos ); Point GetPointerPosPixel(); - Point GetLastPointerPosPixel(); + SAL_DLLPRIVATE Point GetLastPointerPosPixel(); /// Similar to SetPointerPosPixel(), but sets the frame data's last mouse position instead. void SetLastMousePos(const Point& rPos); void ShowPointer( bool bVisible ); @@ -1082,8 +1082,8 @@ public: void EndTracking( TrackingEventFlags nFlags = TrackingEventFlags::NONE ); bool IsTracking() const; - void StartAutoScroll( StartAutoScrollFlags nFlags ); - void EndAutoScroll(); + SAL_DLLPRIVATE void StartAutoScroll( StartAutoScrollFlags nFlags ); + SAL_DLLPRIVATE void EndAutoScroll(); bool HandleScrollCommand( const CommandEvent& rCmd, Scrollable* pHScrl, @@ -1114,7 +1114,7 @@ public: static VclPtr<vcl::Window> FindLOKWindow(vcl::LOKWindowId nWindowId); /// check if LOK Window container is empty - static bool IsLOKWindowsEmpty(); + SAL_DLLPRIVATE static bool IsLOKWindowsEmpty(); /// Dumps itself and potentially its children to a property tree, to be written easily to JSON. virtual void DumpAsPropertyTree(tools::JsonWriter&); @@ -1145,13 +1145,13 @@ public: void SetAccessibleName( const OUString& rName ); OUString GetAccessibleName() const; - void SetAccessibleDescription( const OUString& rDescr ); + SAL_DLLPRIVATE void SetAccessibleDescription( const OUString& rDescr ); OUString GetAccessibleDescription() const; - void SetAccessibleRelationLabeledBy( vcl::Window* pLabeledBy ); + SAL_DLLPRIVATE void SetAccessibleRelationLabeledBy( vcl::Window* pLabeledBy ); vcl::Window* GetAccessibleRelationLabeledBy() const; - void SetAccessibleRelationLabelFor( vcl::Window* pLabelFor ); + SAL_DLLPRIVATE void SetAccessibleRelationLabelFor( vcl::Window* pLabelFor ); vcl::Window* GetAccessibleRelationLabelFor() const; vcl::Window* GetAccessibleRelationMemberOf() const; @@ -1189,7 +1189,7 @@ protected: */ virtual Size GetOptimalSize() const; /// clear OptimalSize cache - void InvalidateSizeCache(); + SAL_DLLPRIVATE void InvalidateSizeCache(); private: SAL_DLLPRIVATE bool ImplIsAccessibleCandidate() const; @@ -1208,7 +1208,7 @@ private: * * @see get_preferred_size */ - Size get_ungrouped_preferred_size() const; + SAL_DLLPRIVATE Size get_ungrouped_preferred_size() const; public: /* records all DrawText operations within the passed rectangle; * a synchronous paint is sent to achieve this @@ -1220,7 +1220,7 @@ public: void SetWindowPeer( css::uno::Reference< css::awt::XVclWindowPeer > const & xPeer, VCLXWindow* pVCLXWindow ); // remember if it was generated by Toolkit - bool IsCreatedWithToolkit() const; + SAL_DLLPRIVATE bool IsCreatedWithToolkit() const; void SetCreatedWithToolkit( bool b ); // Drag and Drop interfaces @@ -1280,14 +1280,14 @@ public: /* * How to horizontally align this widget */ - VclAlign get_halign() const; - void set_halign(VclAlign eAlign); + SAL_DLLPRIVATE VclAlign get_halign() const; + SAL_DLLPRIVATE void set_halign(VclAlign eAlign); /* * How to vertically align this widget */ - VclAlign get_valign() const; - void set_valign(VclAlign eAlign); + SAL_DLLPRIVATE VclAlign get_valign() const; + SAL_DLLPRIVATE void set_valign(VclAlign eAlign); /* * Whether the widget would like to use any available extra horizontal @@ -1312,73 +1312,73 @@ public: /* * Whether the widget should receive extra space when the parent grows */ - bool get_fill() const; - void set_fill(bool bFill); + SAL_DLLPRIVATE bool get_fill() const; + SAL_DLLPRIVATE void set_fill(bool bFill); void set_border_width(sal_Int32 nBorderWidth); - sal_Int32 get_border_width() const; + SAL_DLLPRIVATE sal_Int32 get_border_width() const; - void set_margin_start(sal_Int32 nWidth); - sal_Int32 get_margin_start() const; + SAL_DLLPRIVATE void set_margin_start(sal_Int32 nWidth); + SAL_DLLPRIVATE sal_Int32 get_margin_start() const; - void set_margin_end(sal_Int32 nWidth); - sal_Int32 get_margin_end() const; + SAL_DLLPRIVATE void set_margin_end(sal_Int32 nWidth); + SAL_DLLPRIVATE sal_Int32 get_margin_end() const; void set_margin_top(sal_Int32 nWidth); - sal_Int32 get_margin_top() const; + SAL_DLLPRIVATE sal_Int32 get_margin_top() const; - void set_margin_bottom(sal_Int32 nWidth); - sal_Int32 get_margin_bottom() const; + SAL_DLLPRIVATE void set_margin_bottom(sal_Int32 nWidth); + SAL_DLLPRIVATE sal_Int32 get_margin_bottom() const; /* * How the widget is packed with reference to the start or end of the parent */ - VclPackType get_pack_type() const; - void set_pack_type(VclPackType ePackType); + SAL_DLLPRIVATE VclPackType get_pack_type() const; + SAL_DLLPRIVATE void set_pack_type(VclPackType ePackType); /* * The extra space to put between the widget and its neighbors */ - sal_Int32 get_padding() const; - void set_padding(sal_Int32 nPadding); + SAL_DLLPRIVATE sal_Int32 get_padding() const; + SAL_DLLPRIVATE void set_padding(sal_Int32 nPadding); /* * The number of columns that the widget spans */ - sal_Int32 get_grid_width() const; - void set_grid_width(sal_Int32 nCols); + SAL_DLLPRIVATE sal_Int32 get_grid_width() const; + SAL_DLLPRIVATE void set_grid_width(sal_Int32 nCols); /* * The column number to attach the left side of the widget to */ - sal_Int32 get_grid_left_attach() const; - void set_grid_left_attach(sal_Int32 nAttach); + SAL_DLLPRIVATE sal_Int32 get_grid_left_attach() const; + SAL_DLLPRIVATE void set_grid_left_attach(sal_Int32 nAttach); /* * The number of row that the widget spans */ - sal_Int32 get_grid_height() const; - void set_grid_height(sal_Int32 nRows); + SAL_DLLPRIVATE sal_Int32 get_grid_height() const; + SAL_DLLPRIVATE void set_grid_height(sal_Int32 nRows); /* * The row number to attach the top side of the widget to */ - sal_Int32 get_grid_top_attach() const; - void set_grid_top_attach(sal_Int32 nAttach); + SAL_DLLPRIVATE sal_Int32 get_grid_top_attach() const; + SAL_DLLPRIVATE void set_grid_top_attach(sal_Int32 nAttach); /* * If true this child appears in a secondary layout group of children * e.g. help buttons in a buttonbox */ - bool get_secondary() const; - void set_secondary(bool bSecondary); + SAL_DLLPRIVATE bool get_secondary() const; + SAL_DLLPRIVATE void set_secondary(bool bSecondary); /* * If true this child is exempted from homogeneous sizing * e.g. special button in a buttonbox */ - bool get_non_homogeneous() const; - void set_non_homogeneous(bool bNonHomogeneous); + SAL_DLLPRIVATE bool get_non_homogeneous() const; + SAL_DLLPRIVATE void set_non_homogeneous(bool bNonHomogeneous); /* * Sets a widget property @@ -1392,26 +1392,26 @@ public: * * @return false if attribute is unknown */ - bool set_font_attribute(const OUString &rKey, std::u16string_view rValue); + SAL_DLLPRIVATE bool set_font_attribute(const OUString &rKey, std::u16string_view rValue); /* * Adds this widget to the xGroup VclSizeGroup * */ - void add_to_size_group(const std::shared_ptr<VclSizeGroup>& xGroup); - void remove_from_all_size_groups(); + SAL_DLLPRIVATE void add_to_size_group(const std::shared_ptr<VclSizeGroup>& xGroup); + SAL_DLLPRIVATE void remove_from_all_size_groups(); /* * add/remove mnemonic label */ - void add_mnemonic_label(FixedText *pLabel); - void remove_mnemonic_label(FixedText *pLabel); - const std::vector<VclPtr<FixedText> >& list_mnemonic_labels() const; + SAL_DLLPRIVATE void add_mnemonic_label(FixedText *pLabel); + SAL_DLLPRIVATE void remove_mnemonic_label(FixedText *pLabel); + SAL_DLLPRIVATE const std::vector<VclPtr<FixedText> >& list_mnemonic_labels() const; /* * Move this widget to be the nNewPosition'd child of its parent */ - void reorderWithinParent(sal_uInt16 nNewPosition); + SAL_DLLPRIVATE void reorderWithinParent(sal_uInt16 nNewPosition); /** * Sets an ID. @@ -1457,13 +1457,13 @@ public: virtual bool IsChart() const { return false; } virtual bool IsStarMath() const { return false; } - void SetHelpHdl(const Link<vcl::Window&, bool>& rLink); - void SetMnemonicActivateHdl(const Link<vcl::Window&, bool>& rLink); + SAL_DLLPRIVATE void SetHelpHdl(const Link<vcl::Window&, bool>& rLink); + SAL_DLLPRIVATE void SetMnemonicActivateHdl(const Link<vcl::Window&, bool>& rLink); void SetModalHierarchyHdl(const Link<bool, void>& rLink); - void SetDumpAsPropertyTreeHdl(const Link<tools::JsonWriter&, void>& rLink); + SAL_DLLPRIVATE void SetDumpAsPropertyTreeHdl(const Link<tools::JsonWriter&, void>& rLink); Size GetOutputSizePixel() const; - tools::Rectangle GetOutputRectPixel() const; + SAL_DLLPRIVATE tools::Rectangle GetOutputRectPixel() const; Point LogicToPixel( const Point& rLogicPt ) const; Size LogicToPixel( const Size& rLogicSize ) const; @@ -1480,7 +1480,7 @@ public: Size PixelToLogic( const Size& rDeviceSize ) const; tools::Rectangle PixelToLogic( const tools::Rectangle& rDeviceRect ) const; tools::PolyPolygon PixelToLogic( const tools::PolyPolygon& rDevicePolyPoly ) const; - vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion ) const; + SAL_DLLPRIVATE vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion ) const; Point PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const; Size PixelToLogic( const Size& rDeviceSize, @@ -1506,7 +1506,7 @@ public: void EnableMapMode( bool bEnable = true ); bool IsMapModeEnabled() const; - void SetMapMode(); + SAL_DLLPRIVATE void SetMapMode(); void SetMapMode( const MapMode& rNewMapMode ); // Enabling/disabling RTL only makes sense for OutputDevices that use a mirroring SalGraphicsLayout @@ -1537,28 +1537,28 @@ public: void SetTextFillColor(); void SetTextFillColor( const Color& rColor ); Color GetTextFillColor() const; - bool IsTextFillColor() const; + SAL_DLLPRIVATE bool IsTextFillColor() const; void SetTextLineColor(); void SetTextLineColor( const Color& rColor ); const Color& GetTextLineColor() const; bool IsTextLineColor() const; - void SetOverlineColor(); - void SetOverlineColor( const Color& rColor ); - const Color& GetOverlineColor() const; - bool IsOverlineColor() const; + SAL_DLLPRIVATE void SetOverlineColor(); + SAL_DLLPRIVATE void SetOverlineColor( const Color& rColor ); + SAL_DLLPRIVATE const Color& GetOverlineColor() const; + SAL_DLLPRIVATE bool IsOverlineColor() const; void SetTextAlign( TextAlign eAlign ); - TextAlign GetTextAlign() const; + SAL_DLLPRIVATE TextAlign GetTextAlign() const; /** Query the platform layer for control support */ - bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) const; + SAL_DLLPRIVATE bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) const; /** Query the native control's actual drawing region (including adornment) */ - bool GetNativeControlRegion( + SAL_DLLPRIVATE bool GetNativeControlRegion( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx index a691f8ff46bd..664e137187f9 100644 --- a/include/vcl/wizardmachine.hxx +++ b/include/vcl/wizardmachine.hxx @@ -146,8 +146,8 @@ namespace vcl bool ShowPrevPage(); void AddPage( std::unique_ptr<BuilderPage> xPage ); - void RemovePage( const BuilderPage* pPage ); - void SetPage( WizardTypes::WizardState nLevel, std::unique_ptr<BuilderPage> xPage ); + SAL_DLLPRIVATE void RemovePage( const BuilderPage* pPage ); + SAL_DLLPRIVATE void SetPage( WizardTypes::WizardState nLevel, std::unique_ptr<BuilderPage> xPage ); BuilderPage* GetPage( WizardTypes::WizardState eState ) const; /// enable (or disable) buttons @@ -234,11 +234,11 @@ namespace vcl enabled if and only if determineNextState does not return WZS_INVALID_STATE. */ void enableAutomaticNextButtonState(); - bool isAutomaticNextButtonStateEnabled() const; + SAL_DLLPRIVATE bool isAutomaticNextButtonStateEnabled() const; /** removes a page from the history. Should be called when the page is being disabled */ - void removePageFromHistory(WizardTypes::WizardState nToRemove); + SAL_DLLPRIVATE void removePageFromHistory(WizardTypes::WizardState nToRemove); /** skip a state @@ -300,7 +300,7 @@ namespace vcl /** retrieves a copy of the state history, i.e. all states we already visited */ - void getStateHistory(std::vector<WizardTypes::WizardState>& out_rHistory); + SAL_DLLPRIVATE void getStateHistory(std::vector<WizardTypes::WizardState>& out_rHistory); virtual OUString getPageIdentForState(WizardTypes::WizardState nState) const; virtual WizardTypes::WizardState getStateFromPageIdent(const OUString& rIdent) const; @@ -313,9 +313,9 @@ namespace vcl AccessGuard() { } }; - void suspendTraveling( AccessGuard ); - void resumeTraveling( AccessGuard ); - bool isTravelingSuspended() const; + SAL_DLLPRIVATE void suspendTraveling( AccessGuard ); + SAL_DLLPRIVATE void resumeTraveling( AccessGuard ); + SAL_DLLPRIVATE bool isTravelingSuspended() const; protected: BuilderPage* GetOrCreatePage(const WizardTypes::WizardState i_nState); diff --git a/vcl/inc/animate/AnimationRenderer.hxx b/vcl/inc/animate/AnimationRenderer.hxx index bc86e65e3f46..50e5b4485132 100644 --- a/vcl/inc/animate/AnimationRenderer.hxx +++ b/vcl/inc/animate/AnimationRenderer.hxx @@ -69,13 +69,13 @@ public: const Point& rPt, const Size& rSz, sal_uLong nRendererId, OutputDevice* pFirstFrameOutDev = nullptr ); AnimationRenderer(AnimationRenderer&&) = delete; - ~AnimationRenderer(); + SAL_DLLPRIVATE ~AnimationRenderer(); bool matches(const OutputDevice* pOut, tools::Long nRendererId) const; void drawToIndex( sal_uLong nIndex ); - void draw( sal_uLong nIndex, VirtualDevice* pVDev=nullptr ); - void repaint(); - AnimationData* createAnimationData() const; + SAL_DLLPRIVATE void draw( sal_uLong nIndex, VirtualDevice* pVDev=nullptr ); + SAL_DLLPRIVATE void repaint(); + SAL_DLLPRIVATE AnimationData* createAnimationData() const; void getPosSize( const AnimationFrame& rAnm, Point& rPosPix, Size& rSizePix ); diff --git a/vcl/inc/configsettings.hxx b/vcl/inc/configsettings.hxx index ea6cf65740e7..7daae5449482 100644 --- a/vcl/inc/configsettings.hxx +++ b/vcl/inc/configsettings.hxx @@ -40,20 +40,20 @@ namespace vcl private: std::unordered_map< OUString, SmallOUStrMap > m_aSettings; - virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; + SAL_DLLPRIVATE virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; void getValues(); - SettingsConfigItem(); + SAL_DLLPRIVATE SettingsConfigItem(); - virtual void ImplCommit() override; + SAL_DLLPRIVATE virtual void ImplCommit() override; public: - virtual ~SettingsConfigItem() override; + SAL_DLLPRIVATE virtual ~SettingsConfigItem() override; static SettingsConfigItem* get(); OUString getValue( const OUString& rGroup, const OUString& rKey ) const; - void setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue ); + SAL_DLLPRIVATE void setValue( const OUString& rGroup, const OUString& rKey, const OUString& rValue ); }; diff --git a/vcl/inc/font/FontMetricData.hxx b/vcl/inc/font/FontMetricData.hxx index 83eb77d54c6a..636d2f3f718d 100644 --- a/vcl/inc/font/FontMetricData.hxx +++ b/vcl/inc/font/FontMetricData.hxx @@ -40,7 +40,7 @@ class LogicalFontInstance; class VCL_DLLPUBLIC FontMetricData final : public FontAttributes, public SvRefBase { public: - explicit FontMetricData( const vcl::font::FontSelectPattern& ); + SAL_DLLPRIVATE explicit FontMetricData( const vcl::font::FontSelectPattern& ); // font instance attributes from the font request tools::Long GetWidth() const { return mnWidth; } @@ -94,16 +94,16 @@ public: tools::Long GetDoubleStrikeoutOffset1() const { return mnDStrikeoutOffset1; } tools::Long GetDoubleStrikeoutOffset2() const { return mnDStrikeoutOffset2; } - void ImplInitTextLineSize( const OutputDevice* pDev ); - void ImplInitAboveTextLineSize( const OutputDevice* pDev ); - void ImplInitFlags( const OutputDevice* pDev ); + SAL_DLLPRIVATE void ImplInitTextLineSize( const OutputDevice* pDev ); + SAL_DLLPRIVATE void ImplInitAboveTextLineSize( const OutputDevice* pDev ); + SAL_DLLPRIVATE void ImplInitFlags( const OutputDevice* pDev ); void ImplCalcLineSpacing(LogicalFontInstance *pFontInstance); void ImplInitBaselines(LogicalFontInstance *pFontInstance); private: - bool ShouldNotUseUnderlineMetrics() const; - bool ImplInitTextLineSizeHarfBuzz(LogicalFontInstance *pFontInstance); - bool ShouldUseWinMetrics(int, int, int, int, int, int) const; + SAL_DLLPRIVATE bool ShouldNotUseUnderlineMetrics() const; + SAL_DLLPRIVATE bool ImplInitTextLineSizeHarfBuzz(LogicalFontInstance *pFontInstance); + SAL_DLLPRIVATE bool ShouldUseWinMetrics(int, int, int, int, int, int) const; // font instance attributes from the font request tools::Long mnHeight; // Font size diff --git a/vcl/inc/font/LogicalFontInstance.hxx b/vcl/inc/font/LogicalFontInstance.hxx index 40d3c57c4e67..76c675262adc 100644 --- a/vcl/inc/font/LogicalFontInstance.hxx +++ b/vcl/inc/font/LogicalFontInstance.hxx @@ -81,17 +81,20 @@ public: // TODO: make data members private Degree10 mnOrientation; // text angle in 3600 system bool mbInit; // true if maFontMetric member is valid - void AddFallbackForUnicode(sal_UCS4 cChar, FontWeight eWeight, const OUString& rFontName, - bool bEmbolden, const ItalicMatrix& rMatrix); - bool GetFallbackForUnicode(sal_UCS4 cInChar, FontWeight eInWeight, OUString* pOutFontName, - bool* pOutEmbolden, ItalicMatrix* pOutItalicMatrix) const; - void IgnoreFallbackForUnicode(sal_UCS4, FontWeight eWeight, std::u16string_view rFontName); + SAL_DLLPRIVATE void AddFallbackForUnicode(sal_UCS4 cChar, FontWeight eWeight, + const OUString& rFontName, bool bEmbolden, + const ItalicMatrix& rMatrix); + SAL_DLLPRIVATE bool GetFallbackForUnicode(sal_UCS4 cInChar, FontWeight eInWeight, + OUString* pOutFontName, bool* pOutEmbolden, + ItalicMatrix* pOutItalicMatrix) const; + SAL_DLLPRIVATE void IgnoreFallbackForUnicode(sal_UCS4, FontWeight eWeight, + std::u16string_view rFontName); inline hb_font_t* GetHbFont(); - bool IsGraphiteFont(); + SAL_DLLPRIVATE bool IsGraphiteFont(); // NeedOffsetCorrection: Return if the font need offset correction in TTB direction. // nYOffset is the original offset. It is used to check if the correction is necessary. - bool NeedOffsetCorrection(sal_Int32 nYOffset); + SAL_DLLPRIVATE bool NeedOffsetCorrection(sal_Int32 nYOffset); void SetAverageWidthFactor(double nFactor) { m_nAveWidthFactor = std::abs(nFactor); } double GetAverageWidthFactor() const { return m_nAveWidthFactor; } const vcl::font::FontSelectPattern& GetFontSelectPattern() const { return m_aFontSelData; } @@ -102,15 +105,15 @@ public: // TODO: make data members private bool GetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const; virtual bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const = 0; - basegfx::B2DPolyPolygon GetGlyphOutlineUntransformed(sal_GlyphId) const; + SAL_DLLPRIVATE basegfx::B2DPolyPolygon GetGlyphOutlineUntransformed(sal_GlyphId) const; sal_GlyphId GetGlyphIndex(uint32_t, uint32_t = 0) const; - double GetGlyphWidth(sal_GlyphId, bool = false, bool = true) const; + SAL_DLLPRIVATE double GetGlyphWidth(sal_GlyphId, bool = false, bool = true) const; double GetKashidaWidth() const; - void GetScale(double* nXScale, double* nYScale) const; + SAL_DLLPRIVATE void GetScale(double* nXScale, double* nYScale) const; bool NeedsArtificialItalic() const; bool NeedsArtificialBold() const; @@ -119,11 +122,11 @@ protected: explicit LogicalFontInstance(const vcl::font::PhysicalFontFace&, const vcl::font::FontSelectPattern&); - hb_font_t* InitHbFont(); + SAL_DLLPRIVATE hb_font_t* InitHbFont(); virtual void ImplInitHbFont(hb_font_t*) {} private: - hb_font_t* GetHbFontUntransformed() const; + SAL_DLLPRIVATE hb_font_t* GetHbFontUntransformed() const; struct MapEntry { diff --git a/vcl/inc/font/PhysicalFontCollection.hxx b/vcl/inc/font/PhysicalFontCollection.hxx index d791f7b6927f..56a8de7bc34e 100644 --- a/vcl/inc/font/PhysicalFontCollection.hxx +++ b/vcl/inc/font/PhysicalFontCollection.hxx @@ -52,29 +52,29 @@ public: // fill the list with device font faces void Add( vcl::font::PhysicalFontFace* ); - void Clear(); + SAL_DLLPRIVATE void Clear(); int Count() const { return maPhysicalFontFamilies.size(); } // find the device font family vcl::font::PhysicalFontFamily* FindFontFamily( std::u16string_view rFontName ) const; vcl::font::PhysicalFontFamily* FindOrCreateFontFamily( const OUString &rFamilyName ); - vcl::font::PhysicalFontFamily* FindFontFamily( vcl::font::FontSelectPattern& ) const; + SAL_DLLPRIVATE vcl::font::PhysicalFontFamily* FindFontFamily( vcl::font::FontSelectPattern& ) const; vcl::font::PhysicalFontFamily* FindFontFamilyByTokenNames(std::u16string_view rTokenStr) const; vcl::font::PhysicalFontFamily* FindFontFamilyByAttributes(ImplFontAttrs nSearchType, FontWeight, FontWidth, FontItalic, std::u16string_view rSearchFamily) const; // suggest fonts for glyph fallback - vcl::font::PhysicalFontFamily* GetGlyphFallbackFont( vcl::font::FontSelectPattern&, + SAL_DLLPRIVATE vcl::font::PhysicalFontFamily* GetGlyphFallbackFont( vcl::font::FontSelectPattern&, LogicalFontInstance* pLogicalFont, OUString& rMissingCodes, int nFallbackLevel ) const; // prepare platform specific font substitutions - void SetPreMatchHook( vcl::font::PreMatchFontSubstitution* ); - void SetFallbackHook( vcl::font::GlyphFallbackFontSubstitution* ); + SAL_DLLPRIVATE void SetPreMatchHook( vcl::font::PreMatchFontSubstitution* ); + void SetFallbackHook( vcl::font::GlyphFallbackFontSubstitution* ); // misc utilities - std::shared_ptr<PhysicalFontCollection> Clone() const; - std::unique_ptr<vcl::font::PhysicalFontFaceCollection> GetFontFaceCollection() const; + SAL_DLLPRIVATE std::shared_ptr<PhysicalFontCollection> Clone() const; + SAL_DLLPRIVATE std::unique_ptr<vcl::font::PhysicalFontFaceCollection> GetFontFaceCollection() const; private: mutable bool mbMatchData; // true if matching attributes are initialized @@ -88,13 +88,13 @@ private: mutable std::unique_ptr<std::array<vcl::font::PhysicalFontFamily*,MAX_GLYPHFALLBACK>> mpFallbackList; mutable int mnFallbackCount; - void ImplInitMatchData() const; - void ImplInitGenericGlyphFallback() const; + SAL_DLLPRIVATE void ImplInitMatchData() const; + SAL_DLLPRIVATE void ImplInitGenericGlyphFallback() const; - vcl::font::PhysicalFontFamily* ImplFindFontFamilyBySearchName( const OUString& ) const; - vcl::font::PhysicalFontFamily* ImplFindFontFamilyBySubstFontAttr( const utl::FontNameAttr& ) const; + SAL_DLLPRIVATE vcl::font::PhysicalFontFamily* ImplFindFontFamilyBySearchName( const OUString& ) const; + SAL_DLLPRIVATE vcl::font::PhysicalFontFamily* ImplFindFontFamilyBySubstFontAttr( const utl::FontNameAttr& ) const; - vcl::font::PhysicalFontFamily* ImplFindFontFamilyOfDefaultFont() const; + SAL_DLLPRIVATE vcl::font::PhysicalFontFamily* ImplFindFontFamilyOfDefaultFont() const; }; diff --git a/vcl/inc/font/PhysicalFontFace.hxx b/vcl/inc/font/PhysicalFontFace.hxx index 1fce6a6cbab1..0469f55a7770 100644 --- a/vcl/inc/font/PhysicalFontFace.hxx +++ b/vcl/inc/font/PhysicalFontFace.hxx @@ -152,7 +152,7 @@ public: virtual FontCharMapRef GetFontCharMap() const; virtual bool GetFontCapabilities(vcl::FontCapabilities&) const; - RawFontData GetRawFontData(uint32_t) const; + SAL_DLLPRIVATE RawFontData GetRawFontData(uint32_t) const; bool IsBetterMatch(const vcl::font::FontSelectPattern&, FontMatchStatus&) const; sal_Int32 CompareIgnoreSize(const PhysicalFontFace&) const; @@ -167,18 +167,18 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - bool CreateFontSubset(std::vector<sal_uInt8>&, const sal_GlyphId*, const sal_uInt8*, const int, - FontSubsetInfo&) const; + SAL_DLLPRIVATE bool CreateFontSubset(std::vector<sal_uInt8>&, const sal_GlyphId*, + const sal_uInt8*, const int, FontSubsetInfo&) const; bool IsColorFont() const { return HasColorLayers() || HasColorBitmaps(); } bool HasColorLayers() const; - std::vector<ColorLayer> GetGlyphColorLayers(sal_GlyphId) const; + SAL_DLLPRIVATE std::vector<ColorLayer> GetGlyphColorLayers(sal_GlyphId) const; - const std::vector<ColorPalette>& GetColorPalettes() const; + SAL_DLLPRIVATE const std::vector<ColorPalette>& GetColorPalettes() const; bool HasColorBitmaps() const; - RawFontData GetGlyphColorBitmap(sal_GlyphId, tools::Rectangle&) const; + SAL_DLLPRIVATE RawFontData GetGlyphColorBitmap(sal_GlyphId, tools::Rectangle&) const; OString GetGlyphName(sal_GlyphId, bool = false) const; @@ -206,7 +206,7 @@ protected: explicit PhysicalFontFace(const FontAttributes&); - hb_font_t* GetHbUnscaledFont() const; + SAL_DLLPRIVATE hb_font_t* GetHbUnscaledFont() const; }; } diff --git a/vcl/inc/font/PhysicalFontFamily.hxx b/vcl/inc/font/PhysicalFontFamily.hxx index a944ed72fee3..cd74866f1e77 100644 --- a/vcl/inc/font/PhysicalFontFamily.hxx +++ b/vcl/inc/font/PhysicalFontFamily.hxx @@ -79,17 +79,20 @@ public: ImplFontAttrs GetMatchType() const { return mnMatchType; } FontWeight GetMatchWeight() const { return meMatchWeight; } FontWidth GetMatchWidth() const { return meMatchWidth; } - void InitMatchData(const utl::FontSubstConfiguration&, const OUString& rSearchName); + SAL_DLLPRIVATE void InitMatchData(const utl::FontSubstConfiguration&, + const OUString& rSearchName); void AddFontFace(PhysicalFontFace*); - PhysicalFontFace* FindBestFontFace(const vcl::font::FontSelectPattern& rFSD) const; + SAL_DLLPRIVATE PhysicalFontFace* + FindBestFontFace(const vcl::font::FontSelectPattern& rFSD) const; - void UpdateDevFontList(PhysicalFontFaceCollection&) const; - void UpdateCloneFontList(PhysicalFontCollection&) const; + SAL_DLLPRIVATE void UpdateDevFontList(PhysicalFontFaceCollection&) const; + SAL_DLLPRIVATE void UpdateCloneFontList(PhysicalFontCollection&) const; - static void CalcType(ImplFontAttrs& rType, FontWeight& rWeight, FontWidth& rWidth, - FontFamily eFamily, const utl::FontNameAttr* pFontAttr); + SAL_DLLPRIVATE static void CalcType(ImplFontAttrs& rType, FontWeight& rWeight, + FontWidth& rWidth, FontFamily eFamily, + const utl::FontNameAttr* pFontAttr); private: std::vector<rtl::Reference<PhysicalFontFace>> maFontFaces; diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx index beec3f2fb55d..fbe648940d0c 100644 --- a/vcl/inc/fontsubset.hxx +++ b/vcl/inc/fontsubset.hxx @@ -47,13 +47,13 @@ namespace o3tl { class VCL_DLLPUBLIC FontSubsetInfo final { public: - explicit FontSubsetInfo(); - ~FontSubsetInfo(); + SAL_DLLPRIVATE explicit FontSubsetInfo(); + SAL_DLLPRIVATE ~FontSubsetInfo(); - void LoadFont( FontType eInFontType, + SAL_DLLPRIVATE void LoadFont( FontType eInFontType, const unsigned char* pFontBytes, int nByteLength ); - bool CreateFontSubset( FontType nOutFontTypeMask, + SAL_DLLPRIVATE bool CreateFontSubset( FontType nOutFontTypeMask, SvStream* pOutFile, const char* pOutFontName, const sal_GlyphId* pGlyphIds, const sal_uInt8* pEncodedIds, int nReqGlyphCount); @@ -82,7 +82,7 @@ private: const sal_uInt8* mpReqEncodedIds; int mnReqGlyphCount; - bool CreateFontSubsetFromCff(); + SAL_DLLPRIVATE bool CreateFontSubsetFromCff(); }; int VCL_DLLPUBLIC TestFontSubset(const void* data, sal_uInt32 size); diff --git a/vcl/inc/graphic/GraphicFormatDetector.hxx b/vcl/inc/graphic/GraphicFormatDetector.hxx index 24ffcab18b7a..f2c859d5ab10 100644 --- a/vcl/inc/graphic/GraphicFormatDetector.hxx +++ b/vcl/inc/graphic/GraphicFormatDetector.hxx @@ -165,21 +165,21 @@ public: bool checkPNG(); bool checkAPNG(); bool checkJPG(); - bool checkSVM(); - bool checkPCD(); + SAL_DLLPRIVATE bool checkSVM(); + SAL_DLLPRIVATE bool checkPCD(); bool checkPSD(); bool checkEPS(); - bool checkDXF(); - bool checkPCT(); - bool checkPBM(); - bool checkPGM(); - bool checkPPM(); - bool checkRAS(); + SAL_DLLPRIVATE bool checkDXF(); + SAL_DLLPRIVATE bool checkPCT(); + SAL_DLLPRIVATE bool checkPBM(); + SAL_DLLPRIVATE bool checkPGM(); + SAL_DLLPRIVATE bool checkPPM(); + SAL_DLLPRIVATE bool checkRAS(); bool checkXPM(); bool checkXBM(); bool checkSVG(); bool checkTGA(); - bool checkMOV(); + SAL_DLLPRIVATE bool checkMOV(); bool checkPDF(); bool checkWEBP(); const GraphicMetadata& getMetadata(); @@ -194,8 +194,9 @@ private: * @param nRetSize the amount of bytes actually uncompressed * @return sal_uInt8* a pointer to maFirstBytes or aUncompressed buffer */ - sal_uInt8* checkAndUncompressBuffer(sal_uInt8* aUncompressedBuffer, sal_uInt32 nSize, - sal_uInt64& nDecompressedSize); + SAL_DLLPRIVATE sal_uInt8* checkAndUncompressBuffer(sal_uInt8* aUncompressedBuffer, + sal_uInt32 nSize, + sal_uInt64& nDecompressedSize); bool mbExtendedInfo; bool mbWasCompressed; GraphicMetadata maMetadata; diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index efe32761f5c1..34f3019c7b70 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -100,7 +100,7 @@ class VCL_DLLPUBLIC SvpSalInstance : public SalGenericInstance, public SalUserEv virtual void TriggerUserEventProcessing() override; virtual void ProcessEvent( SalUserEvent aEvent ) override; - bool ImplYield(bool bWait, bool bHandleAllCurrentEvents); + SAL_DLLPRIVATE bool ImplYield(bool bWait, bool bHandleAllCurrentEvents); public: static SvpSalInstance* s_pDefaultInstance; @@ -108,31 +108,31 @@ public: SvpSalInstance( std::unique_ptr<SalYieldMutex> pMutex ); virtual ~SvpSalInstance() override; - void CloseWakeupPipe(); - void Wakeup(SvpRequest request = SvpRequest::NONE); + SAL_DLLPRIVATE void CloseWakeupPipe(); + SAL_DLLPRIVATE void Wakeup(SvpRequest request = SvpRequest::NONE); - void StartTimer( sal_uInt64 nMS ); - void StopTimer(); + SAL_DLLPRIVATE void StartTimer( sal_uInt64 nMS ); + SAL_DLLPRIVATE void StopTimer(); inline void registerFrame( SalFrame* pFrame ); inline void deregisterFrame( SalFrame* pFrame ); - bool CheckTimeout( bool bExecuteTimers = true ); + SAL_DLLPRIVATE bool CheckTimeout( bool bExecuteTimers = true ); // Frame - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override; - virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; + SAL_DLLPRIVATE virtual SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override; + SAL_DLLPRIVATE virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; virtual void DestroyFrame( SalFrame* pFrame ) override; // Object (System Child Window) - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) override; + SAL_DLLPRIVATE virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) override; virtual void DestroyObject( SalObject* pObject ) override; // VirtualDevice // nDX and nDY in Pixel // nBitCount: 0 == Default(=as window) / 1 == Mono // pData allows for using a system dependent graphics or device context - virtual std::unique_ptr<SalVirtualDevice> + SAL_DLLPRIVATE virtual std::unique_ptr<SalVirtualDevice> CreateVirtualDevice( SalGraphics& rGraphics, tools::Long &nDX, tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr ) override; @@ -141,10 +141,10 @@ public: // pSetupData->mpDriverData can be 0 // pSetupData must be updated with the current // JobSetup - virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, + SAL_DLLPRIVATE virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pSetupData ) override; virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override; - virtual std::unique_ptr<SalPrinter> CreatePrinter( SalInfoPrinter* pInfoPrinter ) override; + SAL_DLLPRIVATE virtual std::unique_ptr<SalPrinter> CreatePrinter( SalInfoPrinter* pInfoPrinter ) override; virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) override; virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) override; @@ -152,27 +152,27 @@ public: virtual void PostPrintersChanged() override; // SalTimer - virtual SalTimer* CreateSalTimer() override; + SAL_DLLPRIVATE virtual SalTimer* CreateSalTimer() override; // SalSystem - virtual SalSystem* CreateSalSystem() override; + SAL_DLLPRIVATE virtual SalSystem* CreateSalSystem() override; // SalBitmap virtual std::shared_ptr<SalBitmap> CreateSalBitmap() override; // wait next event and dispatch // must returned by UserEvent (SalFrame::PostEvent) // and timer - virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents) override; - virtual bool AnyInput( VclInputFlags nType ) override; - virtual bool IsMainThread() const override; + SAL_DLLPRIVATE virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents) override; + SAL_DLLPRIVATE virtual bool AnyInput( VclInputFlags nType ) override; + SAL_DLLPRIVATE virtual bool IsMainThread() const override; virtual void updateMainThread() override; virtual OUString GetConnectionIdentifier() override; - virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override; + SAL_DLLPRIVATE virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override; - virtual std::unique_ptr<GenPspGraphics> CreatePrintGraphics() override; + SAL_DLLPRIVATE virtual std::unique_ptr<GenPspGraphics> CreatePrintGraphics() override; - virtual const cairo_font_options_t* GetCairoFontOptions() override; + SAL_DLLPRIVATE virtual const cairo_font_options_t* GetCairoFontOptions() override; }; inline void SvpSalInstance::registerFrame( SalFrame* pFrame ) diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index bdbd45189086..bbde19821a5d 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -131,25 +131,25 @@ public: private: // for glyph+font+script fallback - void MoveGlyph(int nStart, double nNewXPos); - void DropGlyph(int nStart); - void Simplify(bool bIsBase); + SAL_DLLPRIVATE void MoveGlyph(int nStart, double nNewXPos); + SAL_DLLPRIVATE void DropGlyph(int nStart); + SAL_DLLPRIVATE void Simplify(bool bIsBase); GenericSalLayout( const GenericSalLayout& ) = delete; GenericSalLayout& operator=( const GenericSalLayout& ) = delete; - void ApplyDXArray(const double*, const sal_Bool*); - void Justify(double nNewWidth); - void ApplyAsianKerning(std::u16string_view rStr); + SAL_DLLPRIVATE void ApplyDXArray(const double*, const sal_Bool*); + SAL_DLLPRIVATE void Justify(double nNewWidth); + SAL_DLLPRIVATE void ApplyAsianKerning(std::u16string_view rStr); - void GetCharWidths(std::vector<double>& rCharWidths, + SAL_DLLPRIVATE void GetCharWidths(std::vector<double>& rCharWidths, const OUString& rStr) const; - void SetNeedFallback(vcl::text::ImplLayoutArgs&, sal_Int32, bool); + SAL_DLLPRIVATE void SetNeedFallback(vcl::text::ImplLayoutArgs&, sal_Int32, bool); - bool HasVerticalAlternate(sal_UCS4 aChar, sal_UCS4 aNextChar); + SAL_DLLPRIVATE bool HasVerticalAlternate(sal_UCS4 aChar, sal_UCS4 aNextChar); - void ParseFeatures(std::u16string_view name); + SAL_DLLPRIVATE void ParseFeatures(std::u16string_view name); css::uno::Reference<css::i18n::XBreakIterator> mxBreak; diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index 9eede97886b2..9d9898872f88 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -605,7 +605,7 @@ class TrueTypeFont; * @ingroup sft * */ - VCL_DLLPUBLIC void GetTTGlobalFontInfo(AbstractTrueTypeFont *ttf, TTGlobalFontInfo *info); +void GetTTGlobalFontInfo(AbstractTrueTypeFont *ttf, TTGlobalFontInfo *info); /** * Returns part of the head table info, normally collected by GetTTGlobalFontInfo. @@ -621,7 +621,7 @@ class TrueTypeFont; * @return true, if table data could be decoded * @ingroup sft */ - VCL_DLLPUBLIC bool GetTTGlobalFontHeadInfo(const AbstractTrueTypeFont *ttf, int& xMin, int& yMin, int& xMax, int& yMax, sal_uInt16& macStyle); +bool GetTTGlobalFontHeadInfo(const AbstractTrueTypeFont *ttf, int& xMin, int& yMin, int& xMax, int& yMax, sal_uInt16& macStyle); /*- private definitions */ diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index 4204d4199f72..4b1d8fd5d3d6 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -43,7 +43,7 @@ namespace vcl virtual sal_Int32 GetTextBreak( const OUString& _rText, tools::Long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const = 0; virtual bool DecomposeTextRectAction() const = 0; - OUString GetEllipsisString(OUString const& rOrigStr, tools::Long nMaxWidth, DrawTextFlags nStyle); + SAL_DLLPRIVATE OUString GetEllipsisString(OUString const& rOrigStr, tools::Long nMaxWidth, DrawTextFlags nStyle); std::tuple<sal_Int32, sal_Int32> BreakLine(const tools::Long nWidth, OUString const& rStr, css::uno::Reference< css::linguistic2::XHyphenator > const& xHyph, @@ -51,21 +51,21 @@ namespace vcl const bool bHyphenate, const tools::Long nOrigLineWidth, const sal_Int32 nPos, const sal_Int32 nLen); - std::tuple<sal_Int32, sal_Int32> BreakLineSimple(const tools::Long nWidth, OUString const& rStr, + SAL_DLLPRIVATE std::tuple<sal_Int32, sal_Int32> BreakLineSimple(const tools::Long nWidth, OUString const& rStr, const sal_Int32 nPos, sal_Int32 nBreakPos, const tools::Long nOrigLineWidth); - tools::Long GetTextLines(tools::Rectangle const& rRect, const tools::Long nTextHeight, + SAL_DLLPRIVATE tools::Long GetTextLines(tools::Rectangle const& rRect, const tools::Long nTextHeight, ImplMultiTextLineInfo& rLineInfo, tools::Long nWidth, OUString const& rStr, DrawTextFlags nStyle); protected: - ~TextLayoutCommon() COVERITY_NOEXCEPT_FALSE; + SAL_DLLPRIVATE ~TextLayoutCommon() COVERITY_NOEXCEPT_FALSE; private: - OUString GetCenterEllipsisString(std::u16string_view rOrigStr, sal_Int32 nIndex, tools::Long nMaxWidth); - OUString GetEndEllipsisString(OUString const& rOrigStr, sal_Int32 nIndex, tools::Long nMaxWidth, bool bClipText); - OUString GetNewsEllipsisString(OUString const& rOrigStr, tools::Long nMaxWidth, DrawTextFlags nStyle); + SAL_DLLPRIVATE OUString GetCenterEllipsisString(std::u16string_view rOrigStr, sal_Int32 nIndex, tools::Long nMaxWidth); + SAL_DLLPRIVATE OUString GetEndEllipsisString(OUString const& rOrigStr, sal_Int32 nIndex, tools::Long nMaxWidth, bool bClipText); + SAL_DLLPRIVATE OUString GetNewsEllipsisString(OUString const& rOrigStr, tools::Long nMaxWidth, DrawTextFlags nStyle); }; /** is an implementation of TextLayoutCommon which simply delegates its calls to the respective @@ -81,7 +81,7 @@ namespace vcl virtual ~DefaultTextLayout(); // TextLayoutCommon overridables - virtual tools::Long GetTextWidth( const OUString& _rText, + SAL_DLLPRIVATE virtual tools::Long GetTextWidth( const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const override; @@ -92,18 +92,18 @@ namespace vcl std::vector< tools::Rectangle >* _pVector, OUString* _pDisplayText ) override; - virtual tools::Long GetTextArray( const OUString& _rText, + SAL_DLLPRIVATE virtual tools::Long GetTextArray( const OUString& _rText, KernArray* _pDXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength, bool bCaret = false ) const override; - virtual sal_Int32 GetTextBreak( const OUString& _rText, + SAL_DLLPRIVATE virtual sal_Int32 GetTextBreak( const OUString& _rText, tools::Long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const override; - virtual bool DecomposeTextRectAction() const override; + SAL_DLLPRIVATE virtual bool DecomposeTextRectAction() const override; private: OutputDevice& m_rTargetDevice; @@ -119,7 +119,7 @@ namespace vcl ControlTextRenderer( const Control& _rControl, OutputDevice& _rTargetDevice, OutputDevice& _rReferenceDevice ); ~ControlTextRenderer(); - tools::Rectangle DrawText( const tools::Rectangle& _rRect, + tools::Rectangle DrawText( const tools::Rectangle& _rRect, const OUString& _rText, DrawTextFlags _nStyle, std::vector< tools::Rectangle >* _pVector, OUString* _pDisplayText, const Size* i_pDeviceSize ); diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index cad46f77f57a..8a1493c34693 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -55,9 +55,9 @@ class VCL_DLLPUBLIC GenPspGraphics final : public SalGraphicsAutoDelegateToImpl public: GenPspGraphics(); - virtual ~GenPspGraphics() override; + SAL_DLLPRIVATE virtual ~GenPspGraphics() override; - void Init(psp::JobData* pJob); + SAL_DLLPRIVATE void Init(psp::JobData* pJob); // override all pure virtual methods virtual SalGraphicsImpl* GetImpl() const override @@ -65,32 +65,32 @@ public: return m_pBackend.get(); } - virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override; + SAL_DLLPRIVATE virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override; - virtual void SetTextColor( Color nColor ) override; - virtual void SetFont(LogicalFontInstance*, int nFallbackLevel) override; - virtual void GetFontMetric( FontMetricDataRef&, int nFallbackLevel ) override; - virtual FontCharMapRef GetFontCharMap() const override; - virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; - virtual void GetDevFontList( vcl::font::PhysicalFontCollection* ) override; + SAL_DLLPRIVATE virtual void SetTextColor( Color nColor ) override; + SAL_DLLPRIVATE virtual void SetFont(LogicalFontInstance*, int nFallbackLevel) override; + SAL_DLLPRIVATE virtual void GetFontMetric( FontMetricDataRef&, int nFallbackLevel ) override; + SAL_DLLPRIVATE virtual FontCharMapRef GetFontCharMap() const override; + SAL_DLLPRIVATE virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override; + SAL_DLLPRIVATE virtual void GetDevFontList( vcl::font::PhysicalFontCollection* ) override; // graphics must drop any cached font info - virtual void ClearDevFontCache() override; - virtual bool AddTempDevFont( vcl::font::PhysicalFontCollection*, + SAL_DLLPRIVATE virtual void ClearDevFontCache() override; + SAL_DLLPRIVATE virtual bool AddTempDevFont( vcl::font::PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override; - virtual std::unique_ptr<GenericSalLayout> + SAL_DLLPRIVATE virtual std::unique_ptr<GenericSalLayout> GetTextLayout(int nFallbackLevel) override; - virtual void DrawTextLayout( const GenericSalLayout& ) override; + SAL_DLLPRIVATE virtual void DrawTextLayout( const GenericSalLayout& ) override; - virtual SystemGraphicsData GetGraphicsData() const override; + SAL_DLLPRIVATE virtual SystemGraphicsData GetGraphicsData() const override; #if ENABLE_CAIRO_CANVAS - virtual bool SupportsCairo() const override; - virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override; - virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override; - virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override; - virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override; + SAL_DLLPRIVATE virtual bool SupportsCairo() const override; + SAL_DLLPRIVATE virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override; + SAL_DLLPRIVATE virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override; + SAL_DLLPRIVATE virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override; + SAL_DLLPRIVATE virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override; #endif // ENABLE_CAIRO_CANVAS }; diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 122e880228e8..a469f628a873 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -75,7 +75,7 @@ namespace vcl { struct FontCapabilities; } class VCL_DLLPUBLIC FreetypeManager final { public: - ~FreetypeManager(); + SAL_DLLPRIVATE ~FreetypeManager(); static FreetypeManager& get(); @@ -84,19 +84,19 @@ public: sal_IntPtr nFontId, const FontAttributes&); - void AnnounceFonts( vcl::font::PhysicalFontCollection* ) const; + SAL_DLLPRIVATE void AnnounceFonts( vcl::font::PhysicalFontCollection* ) const; void ClearFontCache(); - FreetypeFont* CreateFont(FreetypeFontInstance* pLogicalFont); + SAL_DLLPRIVATE FreetypeFont* CreateFont(FreetypeFontInstance* pLogicalFont); private: // to access the constructor (can't use InitFreetypeManager function, because it's private?!) friend class GenericUnixSalData; - explicit FreetypeManager(); + SAL_DLLPRIVATE explicit FreetypeManager(); - static void InitFreetype(); - FreetypeFontFile* FindFontFile(const OString& rNativeFileName); + SAL_DLLPRIVATE static void InitFreetype(); + SAL_DLLPRIVATE FreetypeFontFile* FindFontFile(const OString& rNativeFileName); typedef std::unordered_map<sal_IntPtr, std::shared_ptr<FreetypeFontInfo>> FontInfoList; typedef std::unordered_map<const char*, std::unique_ptr<FreetypeFontFile>, rtl::CStringHash, rtl::CStringEqual> FontFileList; @@ -109,27 +109,27 @@ private: class VCL_DLLPUBLIC FreetypeFont final { public: - ~FreetypeFont(); + SAL_DLLPRIVATE ~FreetypeFont(); - const OString& GetFontFileName() const; - int GetFontFaceIndex() const; - int GetFontFaceVariation() const; + SAL_DLLPRIVATE const OString& GetFontFileName() const; + SAL_DLLPRIVATE int GetFontFaceIndex() const; + SAL_DLLPRIVATE int GetFontFaceVariation() const; bool TestFont() const { return mbFaceOk;} - FT_Face GetFtFace() const; + SAL_DLLPRIVATE FT_Face GetFtFace() const; const FontConfigFontOptions* GetFontOptions() const; - void GetFontMetric(FontMetricDataRef const &) const; + SAL_DLLPRIVATE void GetFontMetric(FontMetricDataRef const &) const; - bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const; + SAL_DLLPRIVATE bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const; bool GetAntialiasAdvice() const; private: friend class FreetypeFontInstance; friend class FreetypeManager; - explicit FreetypeFont(FreetypeFontInstance&, std::shared_ptr<FreetypeFontInfo> rFontInfo); + SAL_DLLPRIVATE explicit FreetypeFont(FreetypeFontInstance&, std::shared_ptr<FreetypeFontInfo> rFontInfo); - void ApplyGlyphTransform(bool bVertical, FT_Glyph) const; + SAL_DLLPRIVATE void ApplyGlyphTransform(bool bVertical, FT_Glyph) const; FreetypeFontInstance& mrFontInstance; diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 0d642cb3862d..f14893617598 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -269,47 +269,47 @@ protected: mutable Time m_nLastUserEventTime; // mutable because changed on first access virtual void Dispatch( XEvent *pEvent ) = 0; - void InitXinerama(); - void InitRandR( ::Window aRoot ) const; - static void DeInitRandR(); - void processRandREvent( XEvent* ); - - void doDestruct(); - void addXineramaScreenUnique( int i, tools::Long i_nX, tools::Long i_nY, tools::Long i_nWidth, tools::Long i_nHeight ); - Time GetEventTimeImpl( bool bAlwaysReget = false ) const; + SAL_DLLPRIVATE void InitXinerama(); + SAL_DLLPRIVATE void InitRandR( ::Window aRoot ) const; + SAL_DLLPRIVATE static void DeInitRandR(); + SAL_DLLPRIVATE void processRandREvent( XEvent* ); + + SAL_DLLPRIVATE void doDestruct(); + SAL_DLLPRIVATE void addXineramaScreenUnique( int i, tools::Long i_nX, tools::Long i_nY, tools::Long i_nWidth, tools::Long i_nHeight ); + SAL_DLLPRIVATE Time GetEventTimeImpl( bool bAlwaysReget = false ) const; public: - static bool BestVisual(Display *pDisp, int nScreen, XVisualInfo &rVI); + SAL_DLLPRIVATE static bool BestVisual(Display *pDisp, int nScreen, XVisualInfo &rVI); - SalDisplay( Display* pDisp ); + SAL_DLLPRIVATE SalDisplay( Display* pDisp ); virtual ~SalDisplay() override; - void Init(); + SAL_DLLPRIVATE void Init(); #ifdef DBG_UTIL void PrintInfo() const; void DbgPrintDisplayEvent(const char *pComment, const XEvent *pEvent) const; #endif - void Beep() const; + SAL_DLLPRIVATE void Beep() const; - void ModifierMapping(); - void SimulateKeyPress( sal_uInt16 nKeyCode ); - KeyIndicatorState GetIndicatorState() const; - OUString GetKeyNameFromKeySym( KeySym keysym ) const; - OUString GetKeyName( sal_uInt16 nKeyCode ) const; - sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; - KeySym GetKeySym( XKeyEvent *pEvent, + SAL_DLLPRIVATE void ModifierMapping(); + SAL_DLLPRIVATE void SimulateKeyPress( sal_uInt16 nKeyCode ); + SAL_DLLPRIVATE KeyIndicatorState GetIndicatorState() const; + SAL_DLLPRIVATE OUString GetKeyNameFromKeySym( KeySym keysym ) const; + SAL_DLLPRIVATE OUString GetKeyName( sal_uInt16 nKeyCode ) const; + SAL_DLLPRIVATE sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; + SAL_DLLPRIVATE KeySym GetKeySym( XKeyEvent *pEvent, char *pPrintable, int *pLen, KeySym *pUnmodifiedKeySym, Status *pStatus, XIC = nullptr ) const; - Cursor GetPointer( PointerStyle ePointerStyle ); - int CaptureMouse( SalFrame *pCapture ); + SAL_DLLPRIVATE Cursor GetPointer( PointerStyle ePointerStyle ); + SAL_DLLPRIVATE int CaptureMouse( SalFrame *pCapture ); - ScreenData* initScreen( SalX11Screen nXScreen ) const; + SAL_DLLPRIVATE ScreenData* initScreen( SalX11Screen nXScreen ) const; const ScreenData& getDataForScreen( SalX11Screen nXScreen ) const { if( nXScreen.getXScreen() >= m_aScreens.size() ) diff --git a/vcl/inc/widgetdraw/WidgetDefinitionReader.hxx b/vcl/inc/widgetdraw/WidgetDefinitionReader.hxx index 98e8154e151a..c0c806839092 100644 --- a/vcl/inc/widgetdraw/WidgetDefinitionReader.hxx +++ b/vcl/inc/widgetdraw/WidgetDefinitionReader.hxx @@ -24,13 +24,15 @@ private: OUString m_rDefinitionFile; OUString m_rResourcePath; - void readDefinition(tools::XmlWalker& rWalker, WidgetDefinition& rWidgetDefinition, - ControlType eType); + SAL_DLLPRIVATE void readDefinition(tools::XmlWalker& rWalker, + WidgetDefinition& rWidgetDefinition, ControlType eType); - void readPart(tools::XmlWalker& rWalker, std::shared_ptr<WidgetDefinitionPart> rpPart); + SAL_DLLPRIVATE void readPart(tools::XmlWalker& rWalker, + std::shared_ptr<WidgetDefinitionPart> rpPart); - void readDrawingDefinition(tools::XmlWalker& rWalker, - const std::shared_ptr<WidgetDefinitionState>& rStates); + SAL_DLLPRIVATE void + readDrawingDefinition(tools::XmlWalker& rWalker, + const std::shared_ptr<WidgetDefinitionState>& rStates); public: WidgetDefinitionReader(OUString aDefinitionFile, OUString aResourcePath); |