diff options
44 files changed, 215 insertions, 110 deletions
diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx index 8271214f45b4..30ab7357d686 100644 --- a/basic/inc/sbxbase.hxx +++ b/basic/inc/sbxbase.hxx @@ -51,7 +51,7 @@ struct SbxAppData ~SbxAppData(); }; -BASIC_DLLPUBLIC SbxAppData& GetSbxData_Impl(); +SbxAppData& GetSbxData_Impl(); #endif // INCLUDED_BASIC_INC_SBXBASE_HXX diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index ae976c8eb679..c788f2dc9312 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -110,7 +110,7 @@ struct SbiGlobals // utility macros and routines -BASIC_DLLPUBLIC SbiGlobals* GetSbData(); +SbiGlobals* GetSbData(); #endif diff --git a/bin/find-can-be-private-symbols.py b/bin/find-can-be-private-symbols.py index bd4d9511bbc2..baaba9e924ff 100755 --- a/bin/find-can-be-private-symbols.py +++ b/bin/find-can-be-private-symbols.py @@ -13,7 +13,7 @@ import re exported_symbols = set() imported_symbols = set() -subprocess_find = subprocess.Popen("find ./instdir -name *.so", stdout=subprocess.PIPE, shell=True) +subprocess_find = subprocess.Popen("find ./instdir -name *.so && find ./workdir/LinkTarget/CppunitTest -name *.so", stdout=subprocess.PIPE, shell=True) with subprocess_find.stdout as txt: for line in txt: sharedlib = line.strip() @@ -43,7 +43,7 @@ with subprocess_find.stdout as txt: if len(tokens) < 7 or not(tokens[7].startswith("*UND*")): continue sym = tokens[len(tokens)-1] imported_symbols.add(sym) - +subprocess_find.terminate() # look for imported symbols in executables subprocess_find = subprocess.Popen("find ./instdir -name *.bin", stdout=subprocess.PIPE, shell=True) @@ -59,12 +59,120 @@ with subprocess_find.stdout as txt: line2 = line2.strip() sym = line2.split(" ")[1] imported_symbols.add(sym) +subprocess_find.terminate() diff = exported_symbols - imported_symbols print("exported = " + str(len(exported_symbols))) print("imported = " + str(len(imported_symbols))) print("diff = " + str(len(diff))) -# todo process these with c++filt -#for sym in diff: -# if "Sd" in sym: -# print sym + +# standalone functions that are exported but not imported +unused_function_exports = set() +classes_with_exported_symbols = set() +classes_with_imported_symbols = set() + +for sym in exported_symbols: + filtered_sym = subprocess.check_output(["c++filt", sym]).strip() + if filtered_sym.startswith("non-virtual thunk to "): filtered_sym = filtered_sym[21:] + i = filtered_sym.find("(") + i = filtered_sym.rfind("::", 0, i) + if i != -1: + classname = filtered_sym[:i] + func = filtered_sym[i+2:] + # find classes where all of the exported symbols are not imported + classes_with_exported_symbols.add(classname) + if sym in imported_symbols: classes_with_imported_symbols.add(classname) + else: + package = "" + func = filtered_sym + # find standalone functions which are exported but not imported + if not(sym in imported_symbols): unused_function_exports.add(func) + +with open("bin/find-can-be-private-symbols.functions.results", "wt") as f: + for sym in sorted(unused_function_exports): + # Filter out most of the noise. + # No idea where these are coming from, but not our code. + if sym.startswith("CERT_"): continue + elif sym.startswith("DER_"): continue + elif sym.startswith("FORM_"): continue + elif sym.startswith("FPDF"): continue + elif sym.startswith("HASH_"): continue + elif sym.startswith("Hunspell_"): continue + elif sym.startswith("LL_"): continue + elif sym.startswith("LP_"): continue + elif sym.startswith("LU"): continue + elif sym.startswith("MIP"): continue + elif sym.startswith("MPS"): continue + elif sym.startswith("NSS"): continue + elif sym.startswith("NSC_"): continue + elif sym.startswith("PK11"): continue + elif sym.startswith("PL_"): continue + elif sym.startswith("PQ"): continue + elif sym.startswith("PBE_"): continue + elif sym.startswith("PORT_"): continue + elif sym.startswith("PRP_"): continue + elif sym.startswith("PR_"): continue + elif sym.startswith("PT_"): continue + elif sym.startswith("QS_"): continue + elif sym.startswith("REPORT_"): continue + elif sym.startswith("RSA_"): continue + elif sym.startswith("SEC"): continue + elif sym.startswith("SGN"): continue + elif sym.startswith("SOS"): continue + elif sym.startswith("SSL_"): continue + elif sym.startswith("VFY_"): continue + elif sym.startswith("_PR_"): continue + elif sym.startswith("_"): continue + elif sym.startswith("ber_"): continue + elif sym.startswith("bfp_"): continue + elif sym.startswith("ldap_"): continue + elif sym.startswith("ne_"): continue + elif sym.startswith("opj_"): continue + elif sym.startswith("pg_"): continue + elif sym.startswith("pq"): continue + elif sym.startswith("presolve_"): continue + elif sym.startswith("sqlite3_"): continue + # dynamically loaded + elif sym.endswith("get_implementation"): continue + elif sym.endswith("component_getFactory"): continue + elif sym == "CreateDialogFactory": continue + elif sym == "CreateUnoWrapper": continue + elif sym == "CreateWindow": continue + elif sym == "ExportDOC": continue + elif sym == "ExportPPT": continue + elif sym == "ExportRTF": continue + elif sym == "GetSaveWarningOfMSVBAStorage_ww8": continue + elif sym == "GetSpecialCharsForEdit": continue + elif sym.startswith("Import"): continue + elif sym.startswith("Java_com_sun_star_"): continue + elif sym.startswith("TestImport"): continue + elif sym.startswith("getAllCalendars_"): continue + elif sym.startswith("getAllCurrencies_"): continue + elif sym.startswith("getAllFormats"): continue + elif sym.startswith("getBreakIteratorRules_"): continue + elif sym.startswith("getCollationOptions_"): continue + elif sym.startswith("getCollatorImplementation_"): continue + elif sym.startswith("getContinuousNumberingLevels_"): continue + elif sym.startswith("getDateAcceptancePatterns_"): continue + elif sym.startswith("getForbiddenCharacters_"): continue + elif sym.startswith("getIndexAlgorithm_"): continue + elif sym.startswith("getLCInfo_"): continue + elif sym.startswith("getLocaleItem_"): continue + elif sym.startswith("getOutlineNumberingLevels_"): continue + elif sym.startswith("getReservedWords_"): continue + elif sym.startswith("getSTC_"): continue + elif sym.startswith("getSearchOptions_"): continue + elif sym.startswith("getTransliterations_"): continue + elif sym.startswith("getUnicodeScripts_"): continue + elif sym.startswith("lok_"): continue + # UDK API + elif sym.startswith("osl_"): continue + elif sym.startswith("rtl_"): continue + elif sym.startswith("typelib_"): continue + elif sym.startswith("typereg_"): continue + elif sym.startswith("uno_"): continue + f.write(sym + "\n") + +with open("bin/find-can-be-private-symbols.classes.results", "wt") as f: + for sym in sorted(classes_with_exported_symbols - classes_with_imported_symbols): + f.write(sym + "\n") diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx index 201a9de37b37..275eacf2a131 100644 --- a/include/basic/sbdef.hxx +++ b/include/basic/sbdef.hxx @@ -71,7 +71,7 @@ enum class PropertyMode BASIC_DLLPUBLIC extern std::pair<const char*, ErrCode> const RID_BASIC_START[]; BASIC_DLLPUBLIC std::locale BasResLocale(); -BASIC_DLLPUBLIC OUString BasResId(const char* pId); +OUString BasResId(const char* pId); #endif diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx index 22d3e35a785e..87d1ed12a656 100644 --- a/include/editeng/unonrule.hxx +++ b/include/editeng/unonrule.hxx @@ -33,7 +33,7 @@ namespace com::sun::star::beans { struct PropertyValue; } EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(const SvxNumRule* pRule); -EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(); +css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(); /// @throws css::lang::IllegalArgumentException const SvxNumRule& SvxGetNumRule( css::uno::Reference< css::container::XIndexReplace > const & xRule ); EDITENG_DLLPUBLIC css::uno::Reference< css::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw(); diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index fef69993d1ab..c442fa731384 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -664,9 +664,9 @@ public: }; EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet(); -EDITENG_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap(); -EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet(); -EDITENG_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap(); +const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap(); +const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet(); +const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap(); #endif diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index eae1ec09a0f0..d22052efd60b 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -34,7 +34,7 @@ namespace com::sun::star::frame { class XFrame; } class SfxDockingWindow_Impl; enum class SplitWindowItemFlags; -void SFX2_DLLPUBLIC SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); +void SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); bool SFX2_DLLPUBLIC IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName ); class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx index 13f0c10592d3..ad1e185e1986 100644 --- a/include/sot/storinfo.hxx +++ b/include/sot/storinfo.hxx @@ -54,7 +54,7 @@ public: typedef std::vector<SvStorageInfo> SvStorageInfoList; -SOT_DLLPUBLIC SotClipboardFormatId ReadClipboardFormat(SvStream & rStm); +SotClipboardFormatId ReadClipboardFormat(SvStream & rStm); SOT_DLLPUBLIC void WriteClipboardFormat(SvStream & rStm, SotClipboardFormatId nFormat); #endif // _STORINFO_HXX diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx index b9c53ad4c3d5..08ef22fdfa0b 100644 --- a/include/svtools/sampletext.hxx +++ b/include/svtools/sampletext.hxx @@ -18,20 +18,20 @@ class OutputDevice; namespace vcl { class Font; } -SVT_DLLPUBLIC UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCoverage); +UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCoverage); -SVT_DLLPUBLIC bool isSymbolFont(const vcl::Font &rFont); +bool isSymbolFont(const vcl::Font &rFont); -SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice const &rDevice); +bool canRenderNameOfSelectedFont(OutputDevice const &rDevice); //These ones are typically for use in the font dropdown box beside the //fontname, so say things roughly like "Script/Alphabet/Name-Of-Major-Language" -SVT_DLLPUBLIC OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice const &rDevice); -SVT_DLLPUBLIC OUString makeShortRepresentativeTextForSelectedFont(OutputDevice const &rDevice); -SVT_DLLPUBLIC OUString makeShortRepresentativeTextForScript(UScriptCode eScript); +OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice const &rDevice); +OUString makeShortRepresentativeTextForSelectedFont(OutputDevice const &rDevice); +OUString makeShortRepresentativeTextForScript(UScriptCode eScript); //For the cases where the font doesn't fully support a script, but has partial support //for a useful subset -SVT_DLLPUBLIC OUString makeShortMinimalTextForScript(UScriptCode eScript); +OUString makeShortMinimalTextForScript(UScriptCode eScript); //These ones are typically for use in the font preview window in format character SVT_DLLPUBLIC OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &rFont); diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx index b91ba08ceabe..0a10c7b3e32f 100644 --- a/include/svx/sdrhittesthelper.hxx +++ b/include/svx/sdrhittesthelper.hxx @@ -59,7 +59,7 @@ SVX_DLLPUBLIC SdrObject* SdrObjListPrimitiveHit( // the pure HitTest based on a VOC -SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( +bool ViewObjectContactPrimitiveHit( const sdr::contact::ViewObjectContact& rVOC, const basegfx::B2DPoint& rHitPosition, double fLogicHitTolerance, diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 25bd4e98585f..bdab91676811 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -93,7 +93,7 @@ class SdrPaintWindow; * Helper to convert any GDIMetaFile to a good quality BitmapEx, * using default parameters and graphic::XPrimitive2DRenderer */ -BitmapEx SVX_DLLPUBLIC convertMetafileToBitmapEx( +BitmapEx convertMetafileToBitmapEx( const GDIMetaFile& rMtf, const basegfx::B2DRange& rTargetRange, const sal_uInt32 nMaximumQuadraticPixels); diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index a85edab7ef4a..0bc9bee518c5 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -227,8 +227,8 @@ public: tools::Polygon Rect2Poly(const tools::Rectangle& rRect, const GeoStat& rGeo); void Poly2Rect(const tools::Polygon& rPol, tools::Rectangle& rRect, GeoStat& rGeo); -SVX_DLLPUBLIC void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho); -SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho); +void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho); +void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho); // Multiplication and subsequent division // Calculation and intermediate values are in BigInt diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index 3b82b337c6cc..ca81554fb31f 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -96,10 +96,10 @@ public: }; SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut, const css::uno::Reference< css::lang::XComponent >& xComponent ); +extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut, const css::uno::Reference< css::lang::XComponent >& xComponent ); SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut, const css::uno::Reference< css::lang::XComponent >& xComponent, const char* pExportService ); SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream, const css::uno::Reference< css::lang::XComponent >& xComponent ); +extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream, const css::uno::Reference< css::lang::XComponent >& xComponent ); SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream, const css::uno::Reference< css::lang::XComponent >& xComponent, const char* pImportService ); #endif diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx index 34d8918e9573..efc924a1ad2b 100644 --- a/include/toolkit/helper/property.hxx +++ b/include/toolkit/helper/property.hxx @@ -237,7 +237,7 @@ namespace uno { TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const OUString& rPropertyName ); const css::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ); -TOOLKIT_DLLPUBLIC const OUString& GetPropertyName( sal_uInt16 nPropertyId ); +const OUString& GetPropertyName( sal_uInt16 nPropertyId ); sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId ); sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId ); bool DoesDependOnOthers( sal_uInt16 nPropertyId ); diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 69679f7ef33e..33b2e986b573 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -480,7 +480,7 @@ inline std::size_t write_uInt16s_FromOUString(SvStream& rStrm, /// Attempt to write a pascal-style length (of type prefix) prefixed sequence /// of 16bit units from an OUString, returned value is number of bytes written /// (including byte-count of prefix) -TOOLS_DLLPUBLIC std::size_t write_uInt32_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm, +std::size_t write_uInt32_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm, const OUString &rStr); /// Attempt to write a pascal-style length (of type prefix) prefixed sequence diff --git a/include/tools/tenccvt.hxx b/include/tools/tenccvt.hxx index 496b8e499b55..4d1cdcff3177 100644 --- a/include/tools/tenccvt.hxx +++ b/include/tools/tenccvt.hxx @@ -37,7 +37,7 @@ TOOLS_DLLPUBLIC rtl_TextEncoding GetExtendedTextEncoding( rtl_TextEncoding eEnco /// if the given encoding is an multi-byte encoding (which allows more than /// one byte per char, e.g. UTF-8 or Shift-JIS), a one-byte encoding /// is returned (normally windows-1252). -TOOLS_DLLPUBLIC rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding ); +rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding ); TOOLS_DLLPUBLIC rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding ); TOOLS_DLLPUBLIC rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding ); diff --git a/include/vcl/animate/Animation.hxx b/include/vcl/animate/Animation.hxx index b8b390bb0644..c606fb7a85fe 100644 --- a/include/vcl/animate/Animation.hxx +++ b/include/vcl/animate/Animation.hxx @@ -84,8 +84,8 @@ public: short nChannelGPercent, short nChannelBPercent, double fGamma = 1.0, bool bInvert = false); - friend VCL_DLLPUBLIC SvStream& ReadAnimation(SvStream& rIStream, Animation& rAnimation); - friend VCL_DLLPUBLIC SvStream& WriteAnimation(SvStream& rOStream, const Animation& rAnimation); + friend SvStream& ReadAnimation(SvStream& rIStream, Animation& rAnimation); + friend SvStream& WriteAnimation(SvStream& rOStream, const Animation& rAnimation); public: SAL_DLLPRIVATE static void ImplIncAnimCount() { mnAnimCount++; } diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index f6f12c38618c..dd5c715c01b3 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -518,7 +518,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame( @param rSize The size of the frame in pixels */ -BitmapEx VCL_DLLPUBLIC createBlendFrame( +BitmapEx createBlendFrame( const Size& rSize, sal_uInt8 nAlpha, Color aColorTopLeft, diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index c20cc745328a..34d8ed77ad0f 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -65,7 +65,7 @@ VCL_DLLPUBLIC sal_uInt64 vcl_crc64 ( ) SAL_THROW_EXTERN_C(); -VCL_DLLPUBLIC const sal_uInt64* vcl_get_crc64_table(); +const sal_uInt64* vcl_get_crc64_table(); } diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index c3fca958d176..fc21aa296aae 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -98,8 +98,8 @@ public: bool IsEMF() const; // WMF & EMF stored under the same type (NativeWmf) public: - friend VCL_DLLPUBLIC SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink ); - friend VCL_DLLPUBLIC SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink ); + friend SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink ); + friend SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink ); }; #endif diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 70286d9cc7ec..c297e30fd414 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -65,8 +65,8 @@ public: void SetAngle( sal_uInt16 nAngle10 ); sal_uInt16 GetAngle() const { return mpImplHatch->mnAngle; } - friend VCL_DLLPUBLIC SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch ); - friend VCL_DLLPUBLIC SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch ); + friend SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch ); + friend SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch ); private: o3tl::cow_wrapper< ImplHatch > mpImplHatch; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 5fd0a792fe09..b339ef4d4869 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -792,28 +792,28 @@ public: //i.e. acts like pChild = pChild->GetWindow(GetWindowType::FirstChild); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC vcl::Window* firstLogicalChildOfParent(const vcl::Window *pTopLevel); +vcl::Window* firstLogicalChildOfParent(const vcl::Window *pTopLevel); //Get last window of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(GetWindowType::LastChild); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC vcl::Window* lastLogicalChildOfParent(const vcl::Window *pTopLevel); +vcl::Window* lastLogicalChildOfParent(const vcl::Window *pTopLevel); //Get next window after pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(GetWindowType::Next); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC vcl::Window* nextLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild); +vcl::Window* nextLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild); //Get previous window before pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(GetWindowType::Prev); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC vcl::Window* prevLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild); +vcl::Window* prevLogicalChildOfParent(const vcl::Window *pTopLevel, const vcl::Window *pChild); //Returns true is the Window has a single child which is a container VCL_DLLPUBLIC bool isLayoutEnabled(const vcl::Window *pWindow); @@ -837,7 +837,7 @@ inline bool isContainerWindow(const vcl::Window *pWindow) Size getLegacyBestSizeForChildren(const vcl::Window &rWindow); //Get first parent which is not a layout widget -VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent); +vcl::Window* getNonLayoutParent(vcl::Window *pParent); #endif diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 753cc5b54c4f..09cc074075a2 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -92,8 +92,8 @@ public: bool IsDefault() const; - friend VCL_DLLPUBLIC SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ); - friend VCL_DLLPUBLIC SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ); + friend SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ); + friend SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ); // helper to get decomposed polygon data with the LineInfo applied. The source // hairline polygon is given in io_rLinePolyPolygon. Both given polygons may diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index e0be5fa62a41..2851c966c890 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -63,8 +63,8 @@ public: { return !(MapMode::operator==( rMapMode )); } bool IsDefault() const; - friend VCL_DLLPUBLIC SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); - friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ); + friend SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); + friend SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ); // tdf#117984 needs to be thread-safe due to being used e.g. in Bitmaps // vcl::ScopedBitmapAccess in parallelized 3D renderer diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 79497a448014..c67f54bfd792 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -33,7 +33,7 @@ class MouseEvent; class UserDrawEvent; struct ImplStatusItem; -void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, +void DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const tools::Rectangle& rFramePosSize); diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index c6e8e863be3c..3aa0949b90e6 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -104,8 +104,8 @@ public: !IsBitmap() && !IsGradient() && !IsRect(); } - friend VCL_DLLPUBLIC SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ); - friend VCL_DLLPUBLIC SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ); + friend SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ); + friend SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ); }; #endif // INCLUDED_VCL_WALL_HXX diff --git a/oox/inc/ooxresid.hxx b/oox/inc/ooxresid.hxx index ed51b317269b..8fbcd48d8dac 100644 --- a/oox/inc/ooxresid.hxx +++ b/oox/inc/ooxresid.hxx @@ -13,7 +13,7 @@ #include <rtl/ustring.hxx> #include <oox/dllapi.h> -OOX_DLLPUBLIC OUString OoxResId(const char* pId); +OUString OoxResId(const char* pId); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
\ No newline at end of file diff --git a/oox/source/helper/ooxresid.cxx b/oox/source/helper/ooxresid.cxx index 82bf4af91153..7d125505203c 100644 --- a/oox/source/helper/ooxresid.cxx +++ b/oox/source/helper/ooxresid.cxx @@ -11,9 +11,6 @@ #include <ooxresid.hxx> #include <unotools/resmgr.hxx> -OOX_DLLPUBLIC OUString OoxResId(const char* pId) -{ - return Translate::get(pId, Translate::Create("oox")); -} +OUString OoxResId(const char* pId) { return Translate::get(pId, Translate::Create("oox")); } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
\ No newline at end of file diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index ee99b0c10592..646238051e73 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -80,8 +80,8 @@ struct SC_DLLPUBLIC ScCalcConfig bool operator!= (const ScCalcConfig& r) const; }; -SC_DLLPUBLIC OUString ScOpCodeSetToSymbolicString(const ScCalcConfig::OpCodeSet& rOpCodes); -SC_DLLPUBLIC ScCalcConfig::OpCodeSet ScStringToOpCodeSet(const OUString& rOpCodes); +OUString ScOpCodeSetToSymbolicString(const ScCalcConfig::OpCodeSet& rOpCodes); +ScCalcConfig::OpCodeSet ScStringToOpCodeSet(const OUString& rOpCodes); #endif diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 28551b180666..f6a98d1aca8a 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -50,29 +50,29 @@ class SwNodeRange; extern bool bDbgOutStdErr; extern bool bDbgOutPrintAttrSet; -SW_DLLPUBLIC const char * dbg_out(const void * pVoid); -SW_DLLPUBLIC const char * dbg_out(const OUString & aStr); -SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect); -SW_DLLPUBLIC const char * dbg_out(const SwFrameFormat & rFrameFormat); +const char * dbg_out(const void * pVoid); +const char * dbg_out(const OUString & aStr); +const char * dbg_out(const SwRect & rRect); +const char * dbg_out(const SwFrameFormat & rFrameFormat); SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode); SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode); -SW_DLLPUBLIC const char * dbg_out(const SwContentNode * pNode); -SW_DLLPUBLIC const char * dbg_out(const SwTextNode * pNode); -SW_DLLPUBLIC const char * dbg_out(const SwTextAttr & rAttr); -SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints); -SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem); -SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem); -SW_DLLPUBLIC const char * dbg_out(const SfxItemSet & rSet); -SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos); -SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam); -SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum); -SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo); -SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes const & rNodes); -SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule); -SW_DLLPUBLIC const char * dbg_out(const SwTextFormatColl & rFormat); -SW_DLLPUBLIC const char * dbg_out(const SwFrameFormats & rFrameFormats); -SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTable & rTable); -SW_DLLPUBLIC const char * dbg_out(const SwNodeRange & rRange); +const char * dbg_out(const SwContentNode * pNode); +const char * dbg_out(const SwTextNode * pNode); +const char * dbg_out(const SwTextAttr & rAttr); +const char * dbg_out(const SwpHints &rHints); +const char * dbg_out(const SfxPoolItem & rItem); +const char * dbg_out(const SfxPoolItem * pItem); +const char * dbg_out(const SfxItemSet & rSet); +const char * dbg_out(const SwPosition & rPos); +const char * dbg_out(const SwPaM & rPam); +const char * dbg_out(const SwNodeNum & rNum); +const char * dbg_out(const SwUndo & rUndo); +const char * dbg_out(SwOutlineNodes const & rNodes); +const char * dbg_out(const SwNumRule & rRule); +const char * dbg_out(const SwTextFormatColl & rFormat); +const char * dbg_out(const SwFrameFormats & rFrameFormats); +const char * dbg_out(const SwNumRuleTable & rTable); +const char * dbg_out(const SwNodeRange & rRange); template<typename tKey, typename tMember, typename fHashFunction> OUString lcl_dbg_out(const std::unordered_map<tKey, tMember, fHashFunction> & rMap) @@ -103,8 +103,8 @@ const char * dbg_out(const std::unordered_map<tKey, tMember, fHashFunction> & rM { return dbg_out(lcl_dbg_out(rMap)); } -SW_DLLPUBLIC const char * dbg_out(const SwFormToken & rToken); -SW_DLLPUBLIC const char * dbg_out(const SwFormTokens & rTokens); +const char * dbg_out(const SwFormToken & rToken); +const char * dbg_out(const SwFormTokens & rTokens); #endif // DBG_UTIL #endif // INCLUDED_SW_INC_DBGOUTSW_HXX diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index dac13d9637e7..07ca7ff949a2 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -125,12 +125,12 @@ SW_DLLPUBLIC extern SwMoveFnCollection const & fnMoveBackward; using SwGoInDoc = auto (*)(SwPaM& rPam, SwMoveFnCollection const & fnMove) -> bool; SW_DLLPUBLIC bool GoInDoc( SwPaM&, SwMoveFnCollection const &); -SW_DLLPUBLIC bool GoInSection( SwPaM&, SwMoveFnCollection const &); +bool GoInSection( SwPaM&, SwMoveFnCollection const &); SW_DLLPUBLIC bool GoInNode( SwPaM&, SwMoveFnCollection const &); SW_DLLPUBLIC bool GoInContent( SwPaM&, SwMoveFnCollection const &); -SW_DLLPUBLIC bool GoInContentCells( SwPaM&, SwMoveFnCollection const &); -SW_DLLPUBLIC bool GoInContentSkipHidden( SwPaM&, SwMoveFnCollection const &); -SW_DLLPUBLIC bool GoInContentCellsSkipHidden( SwPaM&, SwMoveFnCollection const &); +bool GoInContentCells( SwPaM&, SwMoveFnCollection const &); +bool GoInContentSkipHidden( SwPaM&, SwMoveFnCollection const &); +bool GoInContentCellsSkipHidden( SwPaM&, SwMoveFnCollection const &); /// PaM is Point and Mark: a selection of the document model. class SAL_WARN_UNUSED SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM> diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index c7cddc9fad3a..6bf47bdd3c20 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -262,7 +262,7 @@ public: void MaybeNotifyRedlinePositionModification(long nTop); }; -SW_DLLPUBLIC void MaybeNotifyRedlineModification(SwRangeRedline* pRedline, SwDoc* pDoc); +void MaybeNotifyRedlineModification(SwRangeRedline* pRedline, SwDoc* pDoc); /// Base object for 'Redlines' that are not of 'Ranged' type (like table row insert\delete) class SW_DLLPUBLIC SwExtraRedline diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index dee697c2eed8..03f136e2ea34 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -123,7 +123,7 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm // defined in sw/source/uibase/app/swmodule.cxx SW_DLLPUBLIC OUString SwResId(const char* pId); -SW_DLLPUBLIC OUString SwResId(const char* pId, int nCardinality); +OUString SwResId(const char* pId, int nCardinality); css::uno::Reference< css::linguistic2::XSpellChecker1 > GetSpellChecker(); css::uno::Reference< css::linguistic2::XHyphenator > GetHyphenator(); @@ -195,7 +195,7 @@ SW_DLLPUBLIC const LanguageTag& GetAppLanguageTag(); #endif SW_DLLPUBLIC CollatorWrapper& GetAppCollator(); -SW_DLLPUBLIC CollatorWrapper& GetAppCaseCollator(); +CollatorWrapper& GetAppCaseCollator(); SW_DLLPUBLIC const ::utl::TransliterationWrapper& GetAppCmpStrIgnore(); diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index ae0f1b34f4e6..492c24957fd1 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -52,7 +52,7 @@ const SwTextAttr* GetBkwrdTextHint( const SwpHints&, size_t&, sal_Int32 ); bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode ); bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode ); -SW_DLLPUBLIC SwContentNode* GoNextNds( SwNodeIndex * pIdx, bool ); +SwContentNode* GoNextNds( SwNodeIndex * pIdx, bool ); SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool ); // type definitions of functions diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index c0a06e066ada..5200f39e8017 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -47,7 +47,7 @@ void InsTableBox( SwDoc* pDoc, SwTableNode* pTableNd, SwTableLine* pLine, SwTableBoxFormat* pBoxFrameFormat, SwTableBox* pBox, sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 ); -SW_DLLPUBLIC void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo, +void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo, bool bCalcNewSize, const bool bCorrBorder, SwShareBoxFormats* pShareFormats = nullptr ); diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx index 4d20fe2b39a6..179fe1f80fb0 100644 --- a/sw/source/filter/inc/wrt_fn.hxx +++ b/sw/source/filter/inc/wrt_fn.hxx @@ -31,8 +31,8 @@ class SfxItemSet; typedef Writer& (*FnAttrOut)( Writer&, const SfxPoolItem& ); typedef FnAttrOut SwAttrFnTab[ POOLATTR_END - POOLATTR_BEGIN ]; -SW_DLLPUBLIC Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& ); -SW_DLLPUBLIC Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&, +Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& ); +Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&, bool bDeep ); /* function pointers to the node-write functions */ @@ -49,7 +49,7 @@ RES_NODE_END typedef Writer& (*FnNodeOut)( Writer&, SwContentNode& ); typedef FnNodeOut SwNodeFnTab[ RES_NODE_END - RES_NODE_BEGIN ]; -SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt ); +Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt ); #endif // INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx index d7370fa0dc09..867107bfffe3 100644 --- a/sw/source/uibase/inc/uitool.hxx +++ b/sw/source/uibase/inc/uitool.hxx @@ -69,7 +69,7 @@ SW_DLLPUBLIC void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& rOrig * @param[in] rBackgroundColor the color to apply on the shell * @param[in,out] rShell the shell on which we apply the new attribute **/ -SW_DLLPUBLIC void ApplyCharBackground(const Color& rBackgroundColor, SwWrtShell& rShell); +void ApplyCharBackground(const Color& rBackgroundColor, SwWrtShell& rShell); // SfxItemSets <-> PageDesc void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ); @@ -93,7 +93,7 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ); SW_DLLPUBLIC FieldUnit GetDfltMetric(bool bWeb); void SetDfltMetric(FieldUnit eMetric, bool bWeb); -SW_DLLPUBLIC bool HasCharUnit( bool bWeb ); +bool HasCharUnit( bool bWeb ); void SetApplyCharUnit(bool bApplyChar, bool bWeb); // fill ListBox with all char style templates, except the standard ones diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 56789b91a3f0..e41ec23488b3 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -378,8 +378,8 @@ css::uno::Reference<css::i18n::XCharacterClassification> const& ImplGetCharClass void ImplDeInitSVData(); VCL_PLUGIN_PUBLIC basegfx::SystemDependentDataManager& ImplGetSystemDependentDataManager(); VCL_PLUGIN_PUBLIC vcl::Window* ImplGetDefaultWindow(); -VCL_PLUGIN_PUBLIC vcl::Window* ImplGetDefaultContextWindow(); -VCL_PLUGIN_PUBLIC const std::locale& ImplGetResLocale(); +vcl::Window* ImplGetDefaultContextWindow(); +const std::locale& ImplGetResLocale(); VCL_PLUGIN_PUBLIC OUString VclResId(const char* pId); DockingManager* ImplGetDockingManager(); BlendFrameCache* ImplGetBlendFrameCache(); diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx index 7efe4c6cb4d8..49c422dacfbd 100644 --- a/vcl/inc/unx/gtk/atkbridge.hxx +++ b/vcl/inc/unx/gtk/atkbridge.hxx @@ -22,8 +22,8 @@ #include <vclpluginapi.h> -bool VCLPLUG_GTK_PUBLIC InitAtkBridge(); -void VCLPLUG_GTK_PUBLIC DeInitAtkBridge(); +bool InitAtkBridge(); +void DeInitAtkBridge(); #endif diff --git a/vcl/inc/unx/x11/xlimits.hxx b/vcl/inc/unx/x11/xlimits.hxx index a60584ad417c..b46ff9bb172a 100644 --- a/vcl/inc/unx/x11/xlimits.hxx +++ b/vcl/inc/unx/x11/xlimits.hxx @@ -13,7 +13,7 @@ #include <X11/Xlib.h> #include <vclpluginapi.h> -VCLPLUG_GEN_PUBLIC Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, unsigned int height, unsigned int depth); +Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, unsigned int height, unsigned int depth); #endif // INCLUDED_VCL_INC_UNX_X11_XLIMITS_HXX diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index bc98399a3c1c..6bd2290f777f 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -937,7 +937,7 @@ ReadState GIFReader::ReadGIF( Graphic& rGraphic ) return eReadState; } -VCL_DLLPUBLIC bool IsGIFAnimated(SvStream & rStm) +bool IsGIFAnimated(SvStream & rStm) { GIFReader aReader(rStm); diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx index 81dcddb5d712..25e72f6cc3d2 100644 --- a/vcl/source/filter/igif/gifread.hxx +++ b/vcl/source/filter/igif/gifread.hxx @@ -23,7 +23,7 @@ #include <vcl/graph.hxx> VCL_DLLPUBLIC bool ImportGIF( SvStream& rStream, Graphic& rGraphic ); -VCL_DLLPUBLIC bool IsGIFAnimated(SvStream& rStream); +bool IsGIFAnimated(SvStream& rStream); #endif // INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX diff --git a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx index ee9e40e54ce6..26f8128db263 100644 --- a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx +++ b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx @@ -25,12 +25,12 @@ namespace com::sun::star::xml::crypto { class XUriBinding; } namespace com::sun::star::uno { template <typename > class Reference; } -XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks() ; -XSECXMLSEC_DLLPUBLIC void xmlDisableStreamInputCallbacks() ; -XSECXMLSEC_DLLPUBLIC int xmlRegisterStreamInputCallbacks( +int xmlEnableStreamInputCallbacks() ; +void xmlDisableStreamInputCallbacks() ; +int xmlRegisterStreamInputCallbacks( css::uno::Reference< css::xml::crypto::XUriBinding > const & aUriBinding ); -XSECXMLSEC_DLLPUBLIC int xmlUnregisterStreamInputCallbacks() ; +int xmlUnregisterStreamInputCallbacks() ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 0f8918380855..a0d9d572484f 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -142,7 +142,7 @@ static int xmlStreamClose( void * context ) } -XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks() +int xmlEnableStreamInputCallbacks() { if (!g_bInputCallbacksEnabled) { @@ -204,7 +204,7 @@ XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks() return 0 ; } -XSECXMLSEC_DLLPUBLIC int xmlRegisterStreamInputCallbacks( +int xmlRegisterStreamInputCallbacks( css::uno::Reference< css::xml::crypto::XUriBinding > const & aUriBinding ) { if (!g_bInputCallbacksEnabled) @@ -221,7 +221,7 @@ XSECXMLSEC_DLLPUBLIC int xmlRegisterStreamInputCallbacks( return 0 ; } -XSECXMLSEC_DLLPUBLIC int xmlUnregisterStreamInputCallbacks() +int xmlUnregisterStreamInputCallbacks() { if (g_bInputCallbacksRegistered) { @@ -235,7 +235,7 @@ XSECXMLSEC_DLLPUBLIC int xmlUnregisterStreamInputCallbacks() return 0 ; } -XSECXMLSEC_DLLPUBLIC void xmlDisableStreamInputCallbacks() { +void xmlDisableStreamInputCallbacks() { xmlUnregisterStreamInputCallbacks() ; g_bInputCallbacksEnabled = false; } |