diff options
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/accessibility/AccessibleTextAttributeHelper.hxx | 23 | ||||
-rw-r--r-- | include/vcl/builder.hxx | 16 | ||||
-rw-r--r-- | include/vcl/pdfwriter.hxx | 56 |
3 files changed, 42 insertions, 53 deletions
diff --git a/include/vcl/accessibility/AccessibleTextAttributeHelper.hxx b/include/vcl/accessibility/AccessibleTextAttributeHelper.hxx index 00c9c383929a9..c2bb476aebd67 100644 --- a/include/vcl/accessibility/AccessibleTextAttributeHelper.hxx +++ b/include/vcl/accessibility/AccessibleTextAttributeHelper.hxx @@ -48,20 +48,9 @@ template <> struct o3tl::typed_flags<IA2AttributeType> : is_typed_flags<IA2Attri { }; -class VCL_DLLPUBLIC AccessibleTextAttributeHelper +namespace AccessibleTextAttributeHelper { -public: - /** Converts UNO text attribute properties to a string holding - * the corresponding IAccessible2 text attributes. - * @param rUnoAttributes A sequence holding the UNO text attributes. - * @param eAttributeType: The type(s) of attributes of interest. - * @returns String holding the corresponding IAccessible2 text properties. - */ - static OUString ConvertUnoToIAccessible2TextAttributes( - const css::uno::Sequence<css::beans::PropertyValue>& rUnoAttributes, - IA2AttributeType eAttributeType); - - /** +/** * Get the IAccessible2 text attributes and the span of the attributes at the given index. * @param xText The interface to query for the information. * @param eAttributeType: The type(s) of attributes of interest. @@ -70,10 +59,10 @@ public: * @param rEndOffset Out param that is set to the end index of the attribute run. * @return IAccessible2 text attributes at the given character offset. */ - static OUString - GetIAccessible2TextAttributes(css::uno::Reference<css::accessibility::XAccessibleText> xText, - IA2AttributeType eAttributeType, sal_Int32 nOffset, - sal_Int32& rStartOffset, sal_Int32& rEndOffset); +OUString VCL_DLLPUBLIC +GetIAccessible2TextAttributes(const css::uno::Reference<css::accessibility::XAccessibleText>& xText, + IA2AttributeType eAttributeType, sal_Int32 nOffset, + sal_Int32& rStartOffset, sal_Int32& rEndOffset); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index f8b691946da89..c879d6c97fbaa 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -409,24 +409,24 @@ private: namespace BuilderUtils { //apply the properties of rProps to pWindow - UNLESS_MERGELIBS(VCL_DLLPUBLIC) void set_properties(vcl::Window *pWindow, const VclBuilder::stringmap &rProps); + void set_properties(vcl::Window *pWindow, const VclBuilder::stringmap &rProps); //Convert _ gtk markup to ~ vcl markup - UNLESS_MERGELIBS(VCL_DLLPUBLIC) OUString convertMnemonicMarkup(std::u16string_view rIn); + OUString convertMnemonicMarkup(std::u16string_view rIn); - UNLESS_MERGELIBS(VCL_DLLPUBLIC) OUString extractCustomProperty(VclBuilder::stringmap &rMap); + OUString extractCustomProperty(VclBuilder::stringmap &rMap); - UNLESS_MERGELIBS(VCL_DLLPUBLIC) bool extractDropdown(VclBuilder::stringmap &rMap); + bool extractDropdown(VclBuilder::stringmap &rMap); //add a default value of 25 width-chars to a map if width-chars not set - UNLESS_MERGELIBS(VCL_DLLPUBLIC) void ensureDefaultWidthChars(VclBuilder::stringmap &rMap); + void ensureDefaultWidthChars(VclBuilder::stringmap &rMap); //Helpers to retrofit all the existing code to the builder - UNLESS_MERGELIBS(VCL_DLLPUBLIC) void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox); - UNLESS_MERGELIBS(VCL_DLLPUBLIC) void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition); + void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox); + void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition); //Convert an accessibility role name to accessibility role number - UNLESS_MERGELIBS(VCL_DLLPUBLIC) sal_Int16 getRoleFromName(const OUString& roleName); + sal_Int16 getRoleFromName(const OUString& roleName); } template <typename T> diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 5587dd2c9da22..f4599154e4656 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -78,7 +78,7 @@ class VCL_DLLPUBLIC PDFOutputStream virtual void write( const css::uno::Reference< css::io::XOutputStream >& xStream ) = 0; }; -class VCL_DLLPUBLIC PDFWriter +class PDFWriter { ScopedVclPtr<PDFWriterImpl> xImplementation; @@ -688,8 +688,8 @@ The following structure describes the permissions used in PDF security {} }; - PDFWriter( const PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& ); - ~PDFWriter(); + VCL_DLLPUBLIC PDFWriter( const PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& ); + VCL_DLLPUBLIC ~PDFWriter(); /** Returns an OutputDevice for formatting This Output device is guaranteed to use the same @@ -698,7 +698,7 @@ The following structure describes the permissions used in PDF security @returns the reference output device */ - OutputDevice* GetReferenceDevice(); + VCL_DLLPUBLIC OutputDevice* GetReferenceDevice(); /** Creates a new page to fill If width and height are not set the page size @@ -708,7 +708,7 @@ The following structure describes the permissions used in PDF security Colors and other state information MUST be set again or are undefined. */ - void NewPage( double nPageWidth, double nPageHeight, Orientation eOrientation = Orientation::Inherit ); + VCL_DLLPUBLIC void NewPage( double nPageWidth, double nPageHeight, Orientation eOrientation = Orientation::Inherit ); /** Play a metafile like an outputdevice would do */ struct PlayMetafileContext @@ -726,36 +726,36 @@ The following structure describes the permissions used in PDF security {} }; - void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = nullptr ); + VCL_DLLPUBLIC void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = nullptr ); /* sets the document locale originally passed with the context to a new value * only affects the output if used before calling Emit. */ - void SetDocumentLocale( const css::lang::Locale& rDocLocale ); + VCL_DLLPUBLIC void SetDocumentLocale( const css::lang::Locale& rDocLocale ); /* finishes the file */ - bool Emit(); + VCL_DLLPUBLIC bool Emit(); /* * Get a list of errors that occurred during processing * this should enable the producer to give feedback about * any anomalies that might have occurred */ - std::set< ErrorCode > const & GetErrors() const; + VCL_DLLPUBLIC std::set< ErrorCode > const & GetErrors() const; // uses 128bit encryption - static css::uno::Reference< css::beans::XMaterialHolder > + VCL_DLLPUBLIC static css::uno::Reference< css::beans::XMaterialHolder > InitEncryption( const OUString& i_rOwnerPassword, const OUString& i_rUserPassword ); /* functions for graphics state */ /* flag values: see vcl/outdev.hxx */ - void Push( PushFlags nFlags = PushFlags::ALL ); - void Pop(); + VCL_DLLPUBLIC void Push( PushFlags nFlags = PushFlags::ALL ); + VCL_DLLPUBLIC void Pop(); - void SetClipRegion(); - void SetClipRegion( const basegfx::B2DPolyPolygon& rRegion ); + VCL_DLLPUBLIC void SetClipRegion(); + VCL_DLLPUBLIC void SetClipRegion( const basegfx::B2DPolyPolygon& rRegion ); void MoveClipRegion( tools::Long nHorzMove, tools::Long nVertMove ); void IntersectClipRegion( const tools::Rectangle& rRect ); void IntersectClipRegion( const basegfx::B2DPolyPolygon& rRegion ); @@ -769,8 +769,8 @@ The following structure describes the permissions used in PDF security void SetFillColor( const Color& rColor ); void SetFillColor() { SetFillColor( COL_TRANSPARENT ); } - void SetFont( const vcl::Font& rNewFont ); - void SetTextColor( const Color& rColor ); + VCL_DLLPUBLIC void SetFont( const vcl::Font& rNewFont ); + VCL_DLLPUBLIC void SetTextColor( const Color& rColor ); void SetTextFillColor(); void SetTextFillColor( const Color& rColor ); @@ -780,11 +780,11 @@ The following structure describes the permissions used in PDF security void SetOverlineColor( const Color& rColor ); void SetTextAlign( ::TextAlign eAlign ); - void SetMapMode( const MapMode& rNewMapMode ); + VCL_DLLPUBLIC void SetMapMode( const MapMode& rNewMapMode ); /* actual drawing functions */ - void DrawText( const Point& rPos, const OUString& rText ); + VCL_DLLPUBLIC void DrawText( const Point& rPos, const OUString& rText ); void DrawTextLine( const Point& rPos, tools::Long nWidth, FontStrikeout eStrikeout, @@ -798,7 +798,7 @@ The following structure describes the permissions used in PDF security void DrawStretchText( const Point& rStartPt, sal_Int32 nWidth, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ); - void DrawText( const tools::Rectangle& rRect, + VCL_DLLPUBLIC void DrawText( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle ); void DrawPixel( const Point& rPt, const Color& rColor ); @@ -808,7 +808,7 @@ The following structure describes the permissions used in PDF security void DrawLine( const Point& rStartPt, const Point& rEndPt ); void DrawLine( const Point& rStartPt, const Point& rEndPt, const LineInfo& rLineInfo ); - void DrawPolyLine( const tools::Polygon& rPoly ); + VCL_DLLPUBLIC void DrawPolyLine( const tools::Polygon& rPoly ); void DrawPolyLine( const tools::Polygon& rPoly, const LineInfo& rLineInfo ); void DrawPolyLine( const tools::Polygon& rPoly, const ExtLineInfo& rInfo ); @@ -858,7 +858,7 @@ The following structure describes the permissions used in PDF security will be ignored if the produced PDF has a lower version. The drawing operations will be emitted normally. */ - void BeginTransparencyGroup(); + VCL_DLLPUBLIC void BeginTransparencyGroup(); /** End a transparency group with constant transparency factor @@ -871,7 +871,7 @@ The following structure describes the permissions used in PDF security @param nTransparencePercent The transparency factor */ - void EndTransparencyGroup( const tools::Rectangle& rBoundRect, sal_uInt16 nTransparencePercent ); + VCL_DLLPUBLIC void EndTransparencyGroup( const tools::Rectangle& rBoundRect, sal_uInt16 nTransparencePercent ); /** Insert a JPG encoded image (optionally with mask) @@ -1109,9 +1109,9 @@ The following structure describes the permissions used in PDF security @returns the new structure element's id for use in SetCurrentStructureElement */ - void BeginStructureElement(sal_Int32 id); - sal_Int32 EnsureStructureElement(); - void InitStructureElement(sal_Int32 id, PDFWriter::StructElement eType, std::u16string_view rAlias); + VCL_DLLPUBLIC void BeginStructureElement(sal_Int32 id); + VCL_DLLPUBLIC sal_Int32 EnsureStructureElement(); + VCL_DLLPUBLIC void InitStructureElement(sal_Int32 id, PDFWriter::StructElement eType, std::u16string_view rAlias); /** end the current logical structure element @@ -1120,7 +1120,7 @@ The following structure describes the permissions used in PDF security @see BeginStructureElement */ - void EndStructureElement(); + VCL_DLLPUBLIC void EndStructureElement(); /** set the current structure element For different purposes it may be useful to paint a structure element's @@ -1148,7 +1148,7 @@ The following structure describes the permissions used in PDF security @param eVal the value to set the attribute to */ - void SetStructureAttribute( enum StructAttribute eAttr, enum StructAttributeValue eVal ); + VCL_DLLPUBLIC void SetStructureAttribute( enum StructAttribute eAttr, enum StructAttributeValue eVal ); /** set a structure attribute on the current structural element SetStructureAttributeNumerical sets an attribute of the current structural element @@ -1249,7 +1249,7 @@ The following structure describes the permissions used in PDF security @param pStream the interface to the additional stream */ - void AddAttachedFile(OUString const& rFileName, OUString const& rMimeType, OUString const& rDescription, std::unique_ptr<PDFOutputStream> pStream); + VCL_DLLPUBLIC void AddAttachedFile(OUString const& rFileName, OUString const& rMimeType, OUString const& rDescription, std::unique_ptr<PDFOutputStream> pStream); /// Write rString as a PDF hex string into rBuffer. static void AppendUnicodeTextString(const OUString& rString, OStringBuffer& rBuffer); |