[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/connectivity include/ucbhelper include/vcl

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Tue Jul 20 11:34:41 UTC 2021 

Rebased ref, commits from common ancestor:
commit 55a8ec167ee4a5899b927ecf2ad8b1e3b0b297d0
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Jul 20 11:54:05 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 20 13:33:38 2021 +0200

    these classes are used from non-merged libs
    
    Change-Id: I2eb80d0b3002f174deea0d8657cb0cdbdec5be8f

diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 1911431b256f..734264714b4c 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -49,7 +49,7 @@ namespace dbtools::param
     /** wraps a parameter column as got from an SQLQueryComposer, so that it has an additional
         property "Value", which is forwarded to an XParameters interface
     */
-    class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) ParameterWrapper final : public ::cppu::OWeakObject
+    class OOO_DLLPUBLIC_DBTOOLS ParameterWrapper final : public ::cppu::OWeakObject
                             ,public css::lang::XTypeProvider
                             ,public ::comphelper::OMutexAndBroadcastHelper
                             ,public ::cppu::OPropertySetHelper
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 9e94d83cb964..7333b84f92e5 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -58,7 +58,7 @@ namespace connectivity::sdbcx
 
         typedef css::uno::Reference< css::beans::XPropertySet > ObjectType;
 
-        class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) SAL_NO_VTABLE IObjectCollection
+        class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IObjectCollection
         {
         public:
             virtual ~IObjectCollection();
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index fa4185e2ad1b..63979f250762 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -222,7 +222,7 @@ public:
   * along with an interaction request to indicate the possibility to approve
   * the request.
   */
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionApprove final : public InteractionContinuation,
+class UCBHELPER_DLLPUBLIC InteractionApprove final : public InteractionContinuation,
                            public css::lang::XTypeProvider,
                            public css::task::XInteractionApprove
 {
@@ -255,7 +255,7 @@ public:
   * along with an interaction request to indicate the possibility to disapprove
   * the request.
   */
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionDisapprove final : public InteractionContinuation,
+class UCBHELPER_DLLPUBLIC InteractionDisapprove final : public InteractionContinuation,
                               public css::lang::XTypeProvider,
                               public css::task::XInteractionDisapprove
 {
@@ -288,7 +288,7 @@ public:
   * passed along with an authentication interaction request to enable the
   * interaction handler to supply the missing authentication data.
   */
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionSupplyAuthentication final :
+class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication final :
                   public InteractionContinuation,
                   public css::lang::XTypeProvider,
                   public css::ucb::XInteractionSupplyAuthentication2
diff --git a/include/vcl/IDialogRenderable.hxx b/include/vcl/IDialogRenderable.hxx
index 68a573574186..bb5480f1bf4f 100644
--- a/include/vcl/IDialogRenderable.hxx
+++ b/include/vcl/IDialogRenderable.hxx
@@ -27,7 +27,7 @@ typedef std::pair<const OString, const OString> LOKPayloadItem;
 
 typedef sal_uInt32 LOKWindowId;
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ILibreOfficeKitNotifier
+class VCL_DLLPUBLIC ILibreOfficeKitNotifier
 {
 public:
     virtual ~ILibreOfficeKitNotifier();
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 2e508ff1fdbb..346a4f94e0fb 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -97,7 +97,7 @@ public:
     static MetaAction*  ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData );
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPixelAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPixelAction final : public MetaAction
 {
 private:
     Point               maPt;
@@ -215,7 +215,7 @@ public:
     const tools::Rectangle&    GetRect() const { return maRect; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRoundRectAction final : public MetaAction
+class VCL_DLLPUBLIC MetaRoundRectAction final : public MetaAction
 {
 private:
 
@@ -248,7 +248,7 @@ public:
     sal_uInt32          GetVertRound() const { return mnVertRound; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaEllipseAction final : public MetaAction
+class VCL_DLLPUBLIC MetaEllipseAction final : public MetaAction
 {
 private:
 
@@ -276,7 +276,7 @@ public:
     const tools::Rectangle&    GetRect() const { return maRect; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaArcAction final : public MetaAction
+class VCL_DLLPUBLIC MetaArcAction final : public MetaAction
 {
 private:
 
@@ -309,7 +309,7 @@ public:
     const Point&        GetEndPoint() const { return maEndPt; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPieAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPieAction final : public MetaAction
 {
 private:
 
@@ -342,7 +342,7 @@ public:
     const Point&        GetEndPoint() const { return maEndPt; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaChordAction final : public MetaAction
+class VCL_DLLPUBLIC MetaChordAction final : public MetaAction
 {
 private:
 
@@ -375,7 +375,7 @@ public:
     const Point&        GetEndPoint() const { return maEndPt; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPolyLineAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPolyLineAction final : public MetaAction
 {
 private:
 
@@ -406,7 +406,7 @@ public:
     const LineInfo&     GetLineInfo() const { return maLineInfo; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPolygonAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPolygonAction final : public MetaAction
 {
 private:
 
@@ -434,7 +434,7 @@ public:
     const tools::Polygon& GetPolygon() const { return maPoly; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPolyPolygonAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPolyPolygonAction final : public MetaAction
 {
 private:
 
@@ -497,7 +497,7 @@ public:
     sal_Int32       GetLen() const { return mnLen; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextArrayAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextArrayAction final : public MetaAction
 {
 private:
 
@@ -706,7 +706,7 @@ public:
     const Size&         GetSize() const { return maSz; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaBmpScalePartAction final : public MetaAction
+class VCL_DLLPUBLIC MetaBmpScalePartAction final : public MetaAction
 {
 private:
 
@@ -809,7 +809,7 @@ public:
     bool                IsTransparent() const override { return GetBitmapEx().IsTransparent(); }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaBmpExScalePartAction final : public MetaAction
+class VCL_DLLPUBLIC MetaBmpExScalePartAction final : public MetaAction
 {
 private:
 
@@ -989,7 +989,7 @@ public:
     const Gradient&     GetGradient() const { return maGradient; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaGradientExAction final : public MetaAction
+class VCL_DLLPUBLIC MetaGradientExAction final : public MetaAction
 {
 private:
 
@@ -1049,7 +1049,7 @@ public:
     const Hatch&        GetHatch() const { return maHatch; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaWallpaperAction final : public MetaAction
+class VCL_DLLPUBLIC MetaWallpaperAction final : public MetaAction
 {
 private:
 
@@ -1080,7 +1080,7 @@ public:
     const Wallpaper&    GetWallpaper() const { return maWallpaper; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaClipRegionAction final : public MetaAction
+class VCL_DLLPUBLIC MetaClipRegionAction final : public MetaAction
 {
 private:
 
@@ -1110,7 +1110,7 @@ public:
     bool                IsClipping() const { return mbClip; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaISectRectClipRegionAction final : public MetaAction
+class VCL_DLLPUBLIC MetaISectRectClipRegionAction final : public MetaAction
 {
 private:
 
@@ -1138,7 +1138,7 @@ public:
     const tools::Rectangle&    GetRect() const { return maRect; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaISectRegionClipRegionAction final : public MetaAction
+class VCL_DLLPUBLIC MetaISectRegionClipRegionAction final : public MetaAction
 {
 private:
 
@@ -1166,7 +1166,7 @@ public:
     const vcl::Region&  GetRegion() const { return maRegion; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaMoveClipRegionAction final : public MetaAction
+class VCL_DLLPUBLIC MetaMoveClipRegionAction final : public MetaAction
 {
 private:
 
@@ -1249,7 +1249,7 @@ public:
     bool                IsSetting() const { return mbSet; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextColorAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextColorAction final : public MetaAction
 {
 private:
 
@@ -1274,7 +1274,7 @@ public:
     const Color&        GetColor() const { return maColor; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextFillColorAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextFillColorAction final : public MetaAction
 {
 private:
 
@@ -1301,7 +1301,7 @@ public:
     bool                IsSetting() const { return mbSet; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextLineColorAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextLineColorAction final : public MetaAction
 {
 private:
 
@@ -1328,7 +1328,7 @@ public:
     bool                IsSetting() const { return mbSet; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaOverlineColorAction final : public MetaAction
+class VCL_DLLPUBLIC MetaOverlineColorAction final : public MetaAction
 {
 private:
 
@@ -1355,7 +1355,7 @@ public:
     bool                IsSetting() const { return mbSet; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextAlignAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextAlignAction final : public MetaAction
 {
 private:
 
@@ -1380,7 +1380,7 @@ public:
     TextAlign           GetTextAlign() const { return maAlign; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaMapModeAction final : public MetaAction
+class VCL_DLLPUBLIC MetaMapModeAction final : public MetaAction
 {
 private:
 
@@ -1410,7 +1410,7 @@ public:
 // tdf#127471 decl for friend below
 namespace emfio { class ScaledFontDetectCorrectHelper; }
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaFontAction final : public MetaAction
+class VCL_DLLPUBLIC MetaFontAction final : public MetaAction
 {
 private:
 
@@ -1442,7 +1442,7 @@ public:
     const vcl::Font&    GetFont() const { return maFont; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPushAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPushAction final : public MetaAction
 {
 private:
 
@@ -1467,7 +1467,7 @@ public:
     PushFlags           GetFlags() const { return mnFlags; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPopAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPopAction final : public MetaAction
 {
 public:
 
@@ -1485,7 +1485,7 @@ public:
     virtual void        Read( SvStream& rIStm, ImplMetaReadData* pData ) override;
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRasterOpAction final : public MetaAction
+class VCL_DLLPUBLIC MetaRasterOpAction final : public MetaAction
 {
 private:
 
@@ -1613,7 +1613,7 @@ public:
     const Size&         GetSize() const { return maSize; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRefPointAction final : public MetaAction
+class VCL_DLLPUBLIC MetaRefPointAction final : public MetaAction
 {
 private:
 
@@ -1674,7 +1674,7 @@ public:
     const sal_uInt8*    GetData() const { return mpData.get(); }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaLayoutModeAction final : public MetaAction
+class VCL_DLLPUBLIC MetaLayoutModeAction final : public MetaAction
 {
 private:
 
@@ -1699,7 +1699,7 @@ public:
     ComplexTextLayoutFlags  GetLayoutMode() const { return mnLayoutMode; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextLanguageAction final : public MetaAction
+class VCL_DLLPUBLIC MetaTextLanguageAction final : public MetaAction
 {
 private:

More information about the Libreoffice-commits mailing list