diff options
| -rw-r--r-- | bin/find-can-be-private-symbols.functions.results | 99 | ||||
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 68 | ||||
| -rw-r--r-- | include/sfx2/sidebar/Panel.hxx | 41 | ||||
| -rw-r--r-- | include/svx/selectioncontroller.hxx | 40 | ||||
| -rw-r--r-- | include/unotools/pathoptions.hxx | 16 | ||||
| -rw-r--r-- | include/unotools/tempfile.hxx | 20 | ||||
| -rw-r--r-- | include/vcl/ctrl.hxx | 18 |
7 files changed, 102 insertions, 200 deletions
diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index d2bed209d6bd..dd3bb5ba4b4c 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -156,15 +156,6 @@ CompressGraphicsDialog::UpdateResolutionLB() CompressGraphicsDialog::UpdateSensitivity(bool) CompressGraphicsDialog::recallParameter() ContextChangeEventMultiplexer::GetModuleName(com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) -Control::AppendLayoutData(Control const&) const -Control::Control(WindowType) -Control::CreateLayoutData() const -Control::DrawControlText(OutputDevice&, tools::Rectangle const&, rtl::OUString const&, DrawTextFlags, std::__debug::vector<tools::Rectangle, std::allocator<tools::Rectangle> >*, rtl::OUString*, Size const*) const -Control::GetControlTextRect(OutputDevice&, tools::Rectangle const&, rtl::OUString const&, DrawTextFlags, Size*) const -Control::GetUnzoomedControlPointFont() const -Control::HasLayoutData() const -Control::SetLayoutDataParent(Control const*) const -Control::ToRelativeLineIndex(long) const ConvertChar::RecodeChar(char16_t) const CurrencyBox::DataChanged(DataChangedEvent const&) CurrencyBox::EventNotify(NotifyEvent&) @@ -6604,14 +6595,6 @@ SvtListener::BroadcasterDying(SvtBroadcaster&) SvtModuleOptions::IsDataBase() const SvtOptionsDialogOptions::IsHidden(rtl::OUString const&) const SvtOptionsDrawinglayer::GetSelectionMaximumLuminancePercent() -SvtPathOptions::GetBitmapPath() const -SvtPathOptions::GetDictionaryPath() const -SvtPathOptions::GetFavoritesPath() const -SvtPathOptions::GetFilterPath() const -SvtPathOptions::GetLinguisticPath() const -SvtPathOptions::GetModulePath() const -SvtPathOptions::GetPluginPath() const -SvtPathOptions::UseVariable(rtl::OUString const&) const SvtScriptedTextHelper::SvtScriptedTextHelper(SvtScriptedTextHelper const&) SvtSysLocaleOptions::ConfigurationChanged(utl::ConfigurationBroadcaster*, ConfigurationHints) SvtSysLocaleOptions::GetCurrencyChangeLink() @@ -13742,40 +13725,6 @@ oox::drawingml::GraphicExport::writeNewSvgEntryToStorage(Graphic const&, bool) oox::drawingml::GraphicShapeContext::onCreateContext(int, oox::AttributeList const&) oox::drawingml::GraphicalObjectFrameContext::onCreateContext(int, oox::AttributeList const&) oox::drawingml::GraphicalObjectFrameContext::onEndElement() -oox::drawingml::Shape::Shape(std::shared_ptr<oox::drawingml::Shape> const&) -oox::drawingml::Shape::addChildren(oox::core::XmlFilterBase&, oox::drawingml::Shape&, oox::drawingml::Theme const*, com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, std::__debug::map<rtl::OUString, std::shared_ptr<oox::drawingml::Shape>, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, std::shared_ptr<oox::drawingml::Shape> > > >*, basegfx::B2DHomMatrix const&) -oox::drawingml::Shape::applyShapeReference(oox::drawingml::Shape const&, bool) -oox::drawingml::Shape::cloneFillProperties() -oox::drawingml::Shape::convertSmartArtToMetafile(oox::core::XmlFilterBase const&) -oox::drawingml::Shape::createAndInsert(oox::core::XmlFilterBase&, rtl::OUString const&, oox::drawingml::Theme const*, com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> const&, bool, bool, basegfx::B2DHomMatrix&, oox::drawingml::FillProperties const&, std::shared_ptr<oox::drawingml::Shape>) -oox::drawingml::Shape::finalizeServiceName(oox::core::XmlFilterBase&, rtl::OUString const&, com::sun::star::awt::Rectangle const&) -oox::drawingml::Shape::getActualEffectProperties(oox::drawingml::Theme const*) const -oox::drawingml::Shape::getActualFillProperties(oox::drawingml::Theme const*, oox::drawingml::FillProperties const*) const -oox::drawingml::Shape::getActualLineProperties(oox::drawingml::Theme const*) const -oox::drawingml::Shape::getShapeStyleRef(int) const -oox::drawingml::Shape::getTableProperties() -oox::drawingml::Shape::keepDiagramCompatibilityInfo() -oox::drawingml::Shape::keepDiagramDrawing(oox::core::XmlFilterBase&, rtl::OUString const&) -oox::drawingml::Shape::migrateDiagramHelperToNewShape(std::shared_ptr<oox::drawingml::Shape> const&) -oox::drawingml::Shape::prepareDiagramHelper(std::shared_ptr<oox::drawingml::Diagram> const&, std::shared_ptr<oox::drawingml::Theme> const&) -oox::drawingml::Shape::propagateDiagramHelper() -oox::drawingml::Shape::putPropertiesToGrabBag(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) -oox::drawingml::Shape::putPropertyToGrabBag(com::sun::star::beans::PropertyValue const&) -oox::drawingml::Shape::putPropertyToGrabBag(rtl::OUString const&, com::sun::star::uno::Any const&) -oox::drawingml::Shape::renderDiagramToGraphic(oox::core::XmlFilterBase const&) -oox::drawingml::Shape::resolveRelationshipsOfTypeFromOfficeDoc(oox::core::XmlFilterBase&, rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t> >) -oox::drawingml::Shape::setChartType(bool) -oox::drawingml::Shape::setDefaults(bool) -oox::drawingml::Shape::setDiagramType() -oox::drawingml::Shape::setLockedCanvas(bool) -oox::drawingml::Shape::setMasterTextListStyle(std::shared_ptr<oox::drawingml::TextListStyle> const&) -oox::drawingml::Shape::setOleObjectType() -oox::drawingml::Shape::setTableType() -oox::drawingml::Shape::setTextBody(std::shared_ptr<oox::drawingml::TextBody> const&) -oox::drawingml::Shape::setTextBox(bool) -oox::drawingml::Shape::setWPGChild(bool) -oox::drawingml::Shape::setWordprocessingCanvas(bool) -oox::drawingml::Shape::setWps(bool) oox::drawingml::ShapeContext::onCreateContext(int, oox::AttributeList const&) oox::drawingml::ShapeContext::~ShapeContext() oox::drawingml::ShapeExport::GetNewShapeID(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) @@ -14638,26 +14587,6 @@ sdr::MasterPageDescriptor::SetVisibleLayers(SdrLayerIDSet const&) sdr::MasterPageDescriptor::getCorrectSdrPageProperties() const sdr::MasterPageDescriptor::~MasterPageDescriptor() sdr::PolyPolygonEditor::GetRelativePolyPoint(basegfx::B2DPolyPolygon const&, unsigned int, unsigned int&, unsigned int&) -sdr::SelectionController::ApplyFormatPaintBrush(SfxItemSet&, short, bool, bool) -sdr::SelectionController::ChangeFontSize(bool, FontList const*) -sdr::SelectionController::DeleteMarked() -sdr::SelectionController::Execute(SfxRequest&) -sdr::SelectionController::GetAttributes(SfxItemSet&, bool) const -sdr::SelectionController::GetMarkedSdrObjClone(SdrModel&) -sdr::SelectionController::GetState(SfxItemSet&) -sdr::SelectionController::GetStyleSheet(SfxStyleSheet*&) const -sdr::SelectionController::PasteObjModel(SdrModel const&) -sdr::SelectionController::SetAttributes(SfxItemSet const&, bool) -sdr::SelectionController::SetStyleSheet(SfxStyleSheet*, bool) -sdr::SelectionController::getSelectedCells(sdr::table::CellPos&, sdr::table::CellPos&) -sdr::SelectionController::hasSelectedCells() const -sdr::SelectionController::onKeyInput(KeyEvent const&, vcl::Window*) -sdr::SelectionController::onMouseButtonDown(MouseEvent const&, vcl::Window*) -sdr::SelectionController::onMouseButtonUp(MouseEvent const&, vcl::Window*) -sdr::SelectionController::onMouseMove(MouseEvent const&, vcl::Window*) -sdr::SelectionController::onSelectAll() -sdr::SelectionController::onSelectionHasChanged() -sdr::SelectionController::setCursorLogicPosition(Point const&, bool) sdr::ViewSelection::GetAllMarkedObjects() const sdr::ViewSelection::GetEdgesOfMarkedNodes() const sdr::ViewSelection::GetMarkedEdgesOfMarkedNodes() const @@ -15041,24 +14970,6 @@ sfx2::sidebar::Context::operator!=(sfx2::sidebar::Context const&) const sfx2::sidebar::Context::operator==(sfx2::sidebar::Context const&) const sfx2::sidebar::ControllerItem::GetControlState(unsigned short, boost::property_tree::basic_ptree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&) sfx2::sidebar::ControllerItem::StateChangedAtToolBoxControl(unsigned short, SfxItemState, SfxPoolItem const*) -sfx2::sidebar::Panel::DataChanged() -sfx2::sidebar::Panel::GetContents() const -sfx2::sidebar::Panel::GetElementParentWindow() -sfx2::sidebar::Panel::GetElementWindow() -sfx2::sidebar::Panel::GetFrameWeld() -sfx2::sidebar::Panel::GetTitleBar() const -sfx2::sidebar::Panel::HasIdPredicate(std::basic_string_view<char16_t, std::char_traits<char16_t> >) const -sfx2::sidebar::Panel::Panel(sfx2::sidebar::PanelDescriptor const&, weld::Widget*, bool, sfx2::sidebar::Deck*, std::function<sfx2::sidebar::Context ()>, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) -sfx2::sidebar::Panel::SetExpanded(bool) -sfx2::sidebar::Panel::SetHeightPixel(int) -sfx2::sidebar::Panel::SetLurkMode(bool) -sfx2::sidebar::Panel::SetUIElement(com::sun::star::uno::Reference<com::sun::star::ui::XUIElement> const&) -sfx2::sidebar::Panel::Show(bool) -sfx2::sidebar::Panel::get_extents(tools::Rectangle&) const -sfx2::sidebar::Panel::set_margin_bottom(int) -sfx2::sidebar::Panel::set_margin_top(int) -sfx2::sidebar::Panel::set_vexpand(bool) -sfx2::sidebar::Panel::~Panel() sfx2::sidebar::ResourceManager::GetDeckDescriptor(std::basic_string_view<char16_t, std::char_traits<char16_t> >) const sfx2::sidebar::ResourceManager::GetLastActiveDeck(sfx2::sidebar::Context const&) sfx2::sidebar::ResourceManager::GetLegacyAddonRootNode(rtl::OUString const&) @@ -15731,16 +15642,6 @@ utl::ProgressHandlerWrap::pop() utl::ProgressHandlerWrap::push(com::sun::star::uno::Any const&) utl::ProgressHandlerWrap::update(com::sun::star::uno::Any const&) utl::SearchParam::SearchParam(utl::SearchParam const&) -utl::TempFileFastService::available() -utl::TempFileFastService::checkConnected() -utl::TempFileFastService::checkError() const -utl::TempFileFastService::closeInput() -utl::TempFileFastService::flush() -utl::TempFileFastService::getLength() -utl::TempFileFastService::readSomeBytes(com::sun::star::uno::Sequence<signed char>&, int) -utl::TempFileFastService::skipBytes(int) -utl::TempFileFastService::truncate() -utl::TempFileFastService::~TempFileFastService() utl::TempFileNamed::TempFileNamed(utl::TempFileNamed&&) utl::TextSearch::Init(utl::SearchParam const&, com::sun::star::lang::Locale const&) utl::TextSearch::getXTextSearch(i18nutil::SearchOptions2 const&) diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 455e3f6de9c0..6937e9057b48 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -112,7 +112,7 @@ public: Shape(); explicit Shape( const OUString& rServiceType, bool bDefaultHeight = true ); - explicit Shape( const ShapePtr& pSourceShape ); + SAL_DLLPRIVATE explicit Shape( const ShapePtr& pSourceShape ); Shape(Shape const &) = default; virtual ~Shape(); Shape & operator =(Shape const &) = default; @@ -145,7 +145,7 @@ public: Shape3DProperties& get3DProperties() { return *mp3DPropertiesPtr; } const Shape3DProperties& get3DProperties() const { return *mp3DPropertiesPtr; } - table::TablePropertiesPtr const & getTableProperties(); + SAL_DLLPRIVATE table::TablePropertiesPtr const & getTableProperties(); EffectProperties& getEffectProperties() const { return *mpEffectPropertiesPtr; } @@ -184,19 +184,19 @@ public: const std::optional< sal_Int32 >& getSubTypeIndex() const { return moSubTypeIndex; } // setDefaults has to be called if styles are imported (OfficeXML is not storing properties having the default value) - void setDefaults(bool bHeight); + SAL_DLLPRIVATE void setDefaults(bool bHeight); - ::oox::vml::OleObjectInfo& setOleObjectType(); - ChartShapeInfo& setChartType( bool bEmbedShapes ); - void setDiagramType(); - void setTableType(); + SAL_DLLPRIVATE ::oox::vml::OleObjectInfo& setOleObjectType(); + SAL_DLLPRIVATE ChartShapeInfo& setChartType( bool bEmbedShapes ); + SAL_DLLPRIVATE void setDiagramType(); + SAL_DLLPRIVATE void setTableType(); - void setTextBody(const TextBodyPtr & pTextBody); + SAL_DLLPRIVATE void setTextBody(const TextBodyPtr & pTextBody); const TextBodyPtr& getTextBody() const { return mpTextBody;} - void setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle ); + SAL_DLLPRIVATE void setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle ); const TextListStylePtr& getMasterTextListStyle() const { return mpMasterTextListStyle; } - ShapeStyleRefMap& getShapeStyleRefs() { return maShapeStyleRefs; } + SAL_DLLPRIVATE ShapeStyleRefMap& getShapeStyleRefs() { return maShapeStyleRefs; } const ShapeStyleRefMap& getShapeStyleRefs() const { return maShapeStyleRefs; } const ShapeStyleRef* getShapeStyleRef( sal_Int32 nRefType ) const; bool hasShapeStyleRefs() const { return !maShapeStyleRefs.empty(); } @@ -214,26 +214,26 @@ public: const css::uno::Reference< css::drawing::XShape > & getXShape() const { return mxShape; } - void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true ); + SAL_DLLPRIVATE void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true ); const ::std::vector<OUString>& getExtDrawings() const { return maExtDrawings; } void addExtDrawingRelId( const OUString &rRelId ) { maExtDrawings.push_back( rRelId ); } // Set font color only for extdrawings. void setFontRefColorForNodes(const Color& rColor) { maFontRefColorForNodes = rColor; } const Color& getFontRefColorForNodes() const { return maFontRefColorForNodes; } - void setLockedCanvas(bool bLockedCanvas); + SAL_DLLPRIVATE void setLockedCanvas(bool bLockedCanvas); bool getLockedCanvas() const { return mbLockedCanvas;} - void setWordprocessingCanvas(bool bWordprocessingCanvas); + SAL_DLLPRIVATE void setWordprocessingCanvas(bool bWordprocessingCanvas); bool isInWordprocessingCanvas() const {return mbWordprocessingCanvas;} - void setWPGChild(bool bWPG); + SAL_DLLPRIVATE void setWPGChild(bool bWPG); bool isWPGChild() const { return mbWPGChild;} - void setWps(bool bWps); + SAL_DLLPRIVATE void setWps(bool bWps); bool getWps() const { return mbWps;} - void setTextBox(bool bTextBox); + SAL_DLLPRIVATE void setTextBox(bool bTextBox); const css::uno::Sequence<css::beans::PropertyValue> & getDiagramDoms() const { return maDiagramDoms; } void setDiagramDoms(const css::uno::Sequence<css::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; } - css::uno::Sequence< css::uno::Sequence< css::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc( + SAL_DLLPRIVATE css::uno::Sequence< css::uno::Sequence< css::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc( core::XmlFilterBase& rFilter, const OUString& sFragment, std::u16string_view sType ); void setLinkedTxbxAttributes(const LinkedTxbxAttr& rhs){ maLinkedTxbxAttr = rhs; }; void setTxbxHasLinkedTxtBox( const bool rhs){ mbHasLinkedTxbx = rhs; }; @@ -260,17 +260,17 @@ public: sal_Int32 getVerticalShapesCount() const { return mnVerticalShapesCount; } /// Changes reference semantics to value semantics for fill properties. - void cloneFillProperties(); + SAL_DLLPRIVATE void cloneFillProperties(); - void keepDiagramDrawing(::oox::core::XmlFilterBase& rFilterBase, const OUString& rFragmentPath); + SAL_DLLPRIVATE void keepDiagramDrawing(::oox::core::XmlFilterBase& rFilterBase, const OUString& rFragmentPath); // Allows preparation of a local Diagram helper && propagate an eventually // existing one to the data holder object later - void prepareDiagramHelper(const std::shared_ptr< Diagram >& rDiagramPtr, const std::shared_ptr<::oox::drawingml::Theme>& rTheme); - void propagateDiagramHelper(); + SAL_DLLPRIVATE void prepareDiagramHelper(const std::shared_ptr< Diagram >& rDiagramPtr, const std::shared_ptr<::oox::drawingml::Theme>& rTheme); + SAL_DLLPRIVATE void propagateDiagramHelper(); // for Writer it is necessary to migrate an existing helper to a new Shape - void migrateDiagramHelperToNewShape(const ShapePtr& pTarget); + SAL_DLLPRIVATE void migrateDiagramHelperToNewShape(const ShapePtr& pTarget); protected: @@ -283,7 +283,7 @@ protected: FRAMETYPE_TABLE ///< A table embedded in a shape. }; - css::uno::Reference< css::drawing::XShape > const & + SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > const & createAndInsert( ::oox::core::XmlFilterBase& rFilterBase, const OUString& rServiceName, @@ -296,7 +296,7 @@ protected: oox::drawingml::ShapePtr pParentGroupShape = nullptr ); - void addChildren( + SAL_DLLPRIVATE void addChildren( ::oox::core::XmlFilterBase& rFilterBase, Shape& rMaster, const Theme* pTheme, @@ -304,13 +304,13 @@ protected: ShapeIdMap* pShapeMap, const basegfx::B2DHomMatrix& aTransformation ); - void keepDiagramCompatibilityInfo(); - void convertSmartArtToMetafile( ::oox::core::XmlFilterBase const& rFilterBase ); + SAL_DLLPRIVATE void keepDiagramCompatibilityInfo(); + SAL_DLLPRIVATE void convertSmartArtToMetafile( ::oox::core::XmlFilterBase const& rFilterBase ); - css::uno::Reference< css::drawing::XShape > + SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > renderDiagramToGraphic( ::oox::core::XmlFilterBase const & rFilterBase ); - OUString finalizeServiceName( + SAL_DLLPRIVATE OUString finalizeServiceName( ::oox::core::XmlFilterBase& rFilter, const OUString& rServiceName, const css::awt::Rectangle& rShapeRect ); @@ -319,16 +319,16 @@ protected: ::oox::core::XmlFilterBase& rFilter, const css::uno::Reference< css::drawing::XShapes >& rxShapes ); - void putPropertyToGrabBag( + SAL_DLLPRIVATE void putPropertyToGrabBag( const OUString& sPropertyName, const css::uno::Any& aPropertyValue ); - void putPropertyToGrabBag( + SAL_DLLPRIVATE void putPropertyToGrabBag( const css::beans::PropertyValue& pProperty ); - void putPropertiesToGrabBag( + SAL_DLLPRIVATE void putPropertiesToGrabBag( const css::uno::Sequence< css::beans::PropertyValue >& aProperties ); - FillProperties getActualFillProperties(const Theme* pTheme, const FillProperties* pParentShapeFillProps) const; - LineProperties getActualLineProperties(const Theme* pTheme) const; - EffectProperties getActualEffectProperties(const Theme* pTheme) const; + SAL_DLLPRIVATE FillProperties getActualFillProperties(const Theme* pTheme, const FillProperties* pParentShapeFillProps) const; + SAL_DLLPRIVATE LineProperties getActualLineProperties(const Theme* pTheme) const; + SAL_DLLPRIVATE EffectProperties getActualEffectProperties(const Theme* pTheme) const; std::vector< ShapePtr > maChildren; // only used for group shapes css::awt::Size maChSize; // only used for group shapes diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index c04c6a53a1b9..0e81ba3a4a15 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -53,45 +53,46 @@ class PanelTitleBar; class SFX2_DLLPUBLIC Panel final { public: - Panel(const PanelDescriptor& rPanelDescriptor, weld::Widget* pParentWindow, - const bool bIsInitiallyExpanded, Deck* pDeck, std::function<Context()> aContextAccess, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + SAL_DLLPRIVATE Panel(const PanelDescriptor& rPanelDescriptor, weld::Widget* pParentWindow, + const bool bIsInitiallyExpanded, Deck* pDeck, + std::function<Context()> aContextAccess, + const css::uno::Reference<css::frame::XFrame>& rxFrame); - ~Panel(); + SAL_DLLPRIVATE ~Panel(); - PanelTitleBar* GetTitleBar() const; - weld::Box* GetContents() const; - void Show(bool bShow); + SAL_DLLPRIVATE PanelTitleBar* GetTitleBar() const; + SAL_DLLPRIVATE weld::Box* GetContents() const; + SAL_DLLPRIVATE void Show(bool bShow); bool IsTitleBarOptional() const { return mbIsTitleBarOptional; } - void SetUIElement(const css::uno::Reference<css::ui::XUIElement>& rxElement); + SAL_DLLPRIVATE void SetUIElement(const css::uno::Reference<css::ui::XUIElement>& rxElement); const css::uno::Reference<css::ui::XSidebarPanel>& GetPanelComponent() const { return mxPanelComponent; } - const css::uno::Reference<css::awt::XWindow>& GetElementParentWindow(); - css::uno::Reference<css::awt::XWindow> GetElementWindow(); - void SetExpanded(const bool bIsExpanded); + SAL_DLLPRIVATE const css::uno::Reference<css::awt::XWindow>& GetElementParentWindow(); + SAL_DLLPRIVATE css::uno::Reference<css::awt::XWindow> GetElementWindow(); + SAL_DLLPRIVATE void SetExpanded(const bool bIsExpanded); bool IsExpanded() const { return mbIsExpanded; } - bool HasIdPredicate(std::u16string_view rsId) const; + SAL_DLLPRIVATE bool HasIdPredicate(std::u16string_view rsId) const; const OUString& GetId() const { return msPanelId; } const OUString& GetTitle() const { return msTitle; } void TriggerDeckLayouting(); - void SetHeightPixel(int nHeight); + SAL_DLLPRIVATE void SetHeightPixel(int nHeight); - bool get_extents(tools::Rectangle& rExtents) const; + SAL_DLLPRIVATE bool get_extents(tools::Rectangle& rExtents) const; /// Set whether a panel should be present but invisible / inactive - void SetLurkMode(bool bLurk); + SAL_DLLPRIVATE void SetLurkMode(bool bLurk); bool IsLurking() const { return mbLurking; } - void set_margin_top(int nMargin); - void set_margin_bottom(int nMargin); - void set_vexpand(bool bExpand); + SAL_DLLPRIVATE void set_margin_top(int nMargin); + SAL_DLLPRIVATE void set_margin_bottom(int nMargin); + SAL_DLLPRIVATE void set_vexpand(bool bExpand); - weld::Window* GetFrameWeld(); + SAL_DLLPRIVATE weld::Window* GetFrameWeld(); - void DataChanged(); + SAL_DLLPRIVATE void DataChanged(); private: std::unique_ptr<weld::Builder> mxBuilder; diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx index 7794f3567f1e..ea7c39a8c258 100644 --- a/include/svx/selectioncontroller.hxx +++ b/include/svx/selectioncontroller.hxx @@ -43,42 +43,42 @@ namespace table { struct CellPos; } class SVXCORE_DLLPUBLIC SelectionController: public cppu::OWeakObject { public: - virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); - virtual bool onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin); - virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin); - virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin); + SAL_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); + SAL_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin); + SAL_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin); + SAL_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin); - virtual void onSelectionHasChanged(); + SAL_DLLPRIVATE virtual void onSelectionHasChanged(); - virtual void onSelectAll(); + SAL_DLLPRIVATE virtual void onSelectAll(); - virtual void GetState( SfxItemSet& rSet ); - virtual void Execute( SfxRequest& rReq ); + SAL_DLLPRIVATE virtual void GetState( SfxItemSet& rSet ); + SAL_DLLPRIVATE virtual void Execute( SfxRequest& rReq ); - virtual bool DeleteMarked(); + SAL_DLLPRIVATE virtual bool DeleteMarked(); - virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; - virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); + SAL_DLLPRIVATE virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; + SAL_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); - virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const; - virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ); + SAL_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const; + SAL_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ); - virtual rtl::Reference<SdrObject> GetMarkedSdrObjClone( SdrModel& rTargetModel ); - virtual bool PasteObjModel( const SdrModel& rModel ); + SAL_DLLPRIVATE virtual rtl::Reference<SdrObject> GetMarkedSdrObjClone( SdrModel& rTargetModel ); + SAL_DLLPRIVATE virtual bool PasteObjModel( const SdrModel& rModel ); /** applies a format paint brush set from the current selection. if bNoCharacterFormats is true, no character attributes are changed. if bNoParagraphFormats is true, no paragraph attributes are changed. */ - virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, sal_Int16 nDepth, bool bNoCharacterFormats, bool bNoParagraphFormats ); + SAL_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, sal_Int16 nDepth, bool bNoCharacterFormats, bool bNoParagraphFormats ); /// This is a table object, and one or more of its cells are selected. - virtual bool hasSelectedCells() const; + SAL_DLLPRIVATE virtual bool hasSelectedCells() const; /// Allows adjusting the point or mark of the selection to a document coordinate. - virtual bool setCursorLogicPosition(const Point& rPosition, bool bPoint); + SAL_DLLPRIVATE virtual bool setCursorLogicPosition(const Point& rPosition, bool bPoint); /// Get the position of the first and the last selected cell. - virtual void getSelectedCells(table::CellPos& rFirstPos, table::CellPos& rLastPos); + SAL_DLLPRIVATE virtual void getSelectedCells(table::CellPos& rFirstPos, table::CellPos& rLastPos); /// Changes the font (grow/shrink) according to the input parameters. - virtual bool ChangeFontSize(bool bGrow, const FontList* pFontList); + SAL_DLLPRIVATE virtual bool ChangeFontSize(bool bGrow, const FontList* pFontList); }; } diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx index c19a2b34baf4..6c1f63713143 100644 --- a/include/unotools/pathoptions.hxx +++ b/include/unotools/pathoptions.hxx @@ -80,19 +80,19 @@ public: const OUString& GetAutoTextPath() const; const OUString& GetBackupPath() const; const OUString& GetBasicPath() const; - const OUString& GetBitmapPath() const; + SAL_DLLPRIVATE const OUString& GetBitmapPath() const; const OUString& GetConfigPath() const; - const OUString& GetDictionaryPath() const; - const OUString& GetFavoritesPath() const; - const OUString& GetFilterPath() const; + SAL_DLLPRIVATE const OUString& GetDictionaryPath() const; + SAL_DLLPRIVATE const OUString& GetFavoritesPath() const; + SAL_DLLPRIVATE const OUString& GetFilterPath() const; const OUString& GetGalleryPath() const; const OUString& GetGraphicPath() const; const OUString& GetHelpPath() const; - const OUString& GetLinguisticPath() const; - const OUString& GetModulePath() const; + SAL_DLLPRIVATE const OUString& GetLinguisticPath() const; + SAL_DLLPRIVATE const OUString& GetModulePath() const; const OUString& GetIconsetPath() const; const OUString& GetPalettePath() const; - const OUString& GetPluginPath() const; + SAL_DLLPRIVATE const OUString& GetPluginPath() const; const OUString& GetStoragePath() const; const OUString& GetTempPath() const; const OUString& GetTemplatePath() const; @@ -110,7 +110,7 @@ public: OUString SubstituteVariable( const OUString& rVar ) const; OUString ExpandMacros( const OUString& rPath ) const; - OUString UseVariable( const OUString& rVar ) const; + SAL_DLLPRIVATE OUString UseVariable( const OUString& rVar ) const; bool SearchFile( OUString& rIniFile, Paths ePath = Paths::UserConfig ); }; diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx index e67491102511..db303a949f3a 100644 --- a/include/unotools/tempfile.hxx +++ b/include/unotools/tempfile.hxx @@ -204,32 +204,32 @@ class UNOTOOLS_DLLPUBLIC TempFileFastService final : public TempFileFastService_ bool mbInClosed; bool mbOutClosed; - void checkError () const; - void checkConnected (); + SAL_DLLPRIVATE void checkError () const; + SAL_DLLPRIVATE void checkConnected (); public: explicit TempFileFastService (); - virtual ~TempFileFastService () override; + SAL_DLLPRIVATE virtual ~TempFileFastService () override; // XInputStream virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) override; - virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) override; - virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override; - virtual ::sal_Int32 SAL_CALL available( ) override; - virtual void SAL_CALL closeInput( ) override; + SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) override; + SAL_DLLPRIVATE virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override; + SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL available( ) override; + SAL_DLLPRIVATE virtual void SAL_CALL closeInput( ) override; // XOutputStream virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) override; - virtual void SAL_CALL flush( ) override; + SAL_DLLPRIVATE virtual void SAL_CALL flush( ) override; virtual void SAL_CALL closeOutput( ) override; // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) override; virtual sal_Int64 SAL_CALL getPosition( ) override; - virtual sal_Int64 SAL_CALL getLength( ) override; + SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getLength( ) override; // XStream virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override; virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) override; // XTruncate - virtual void SAL_CALL truncate() override; + SAL_DLLPRIVATE virtual void SAL_CALL truncate() override; }; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 6d8bba77b3d1..3f838aba1a70 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -93,16 +93,16 @@ private: Control & operator= (const Control &) = delete; protected: - Control( WindowType nType ); + SAL_DLLPRIVATE Control( WindowType nType ); virtual void FillLayoutData() const; // helper method for composite controls - void AppendLayoutData( const Control& rSubControl ) const; + SAL_DLLPRIVATE void AppendLayoutData( const Control& rSubControl ) const; /// creates the mpData->mpLayoutData structure - void CreateLayoutData() const; + SAL_DLLPRIVATE void CreateLayoutData() const; /// determines whether we currently have layout data - bool HasLayoutData() const; + SAL_DLLPRIVATE bool HasLayoutData() const; /** this calls both our event listeners, and a specified handler @@ -131,12 +131,12 @@ protected: at the target device, or taking the reference device into account) when returning. */ - tools::Rectangle DrawControlText( OutputDevice& _rTargetDevice, const tools::Rectangle& _rRect, + SAL_DLLPRIVATE tools::Rectangle DrawControlText( OutputDevice& _rTargetDevice, const tools::Rectangle& _rRect, const OUString& _rStr, DrawTextFlags _nStyle, std::vector< tools::Rectangle >* _pVector, OUString* _pDisplayText, const Size* i_pDeviceSize = nullptr ) const; - tools::Rectangle GetControlTextRect( OutputDevice& _rTargetDevice, const tools::Rectangle & rRect, + SAL_DLLPRIVATE tools::Rectangle GetControlTextRect( OutputDevice& _rTargetDevice, const tools::Rectangle & rRect, const OUString& _rStr, DrawTextFlags _nStyle, Size* o_pDeviceSize = nullptr ) const; @@ -207,7 +207,7 @@ public: the relative index inside the displayed line or -1 if the absolute index does not match any line */ - tools::Long ToRelativeLineIndex( tools::Long nIndex ) const; + SAL_DLLPRIVATE tools::Long ToRelativeLineIndex( tools::Long nIndex ) const; void SetLoseFocusHdl( const Link<Control&,void>& rLink ) { maLoseFocusHdl = rLink; } @@ -215,7 +215,7 @@ public: */ bool HasControlFocus() const { return mbHasControlFocus; } - void SetLayoutDataParent( const Control* pParent ) const; + SAL_DLLPRIVATE void SetLayoutDataParent( const Control* pParent ) const; virtual Size GetOptimalSize() const override; @@ -225,7 +225,7 @@ public: void SetReferenceDevice( OutputDevice* _referenceDevice ); OutputDevice* GetReferenceDevice() const; - vcl::Font GetUnzoomedControlPointFont() const; + SAL_DLLPRIVATE vcl::Font GetUnzoomedControlPointFont() const; void SetShowAccelerator (bool val); /// Notify the LOK client about an invalidated area. |