vcl2gnumake: rebase to DEV300m103

1 files changed, 3 insertions, 5 deletions

diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index 3980031cf7b6..819180b30bf6 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -37,7 +37,7 @@
 
 // Modules
 
-class VCL_DLLPUBLIC GraphiteLayoutImpl : public GraphiteLayout
+class VCL_PLUGIN_PUBLIC GraphiteLayoutImpl : public GraphiteLayout
 {
 public:
     GraphiteLayoutImpl(const gr::Font & font, const grutils::GrFeatureParser * features, GraphiteFontAdaptor * pFont) throw()
@@ -51,14 +51,14 @@ private:
 // This class implments the server font specific parts.
 // @author tse
 //
-class VCL_DLLPUBLIC GraphiteServerFontLayout : public ServerFontLayout
+class VCL_PLUGIN_PUBLIC GraphiteServerFontLayout : public ServerFontLayout
 {
 private:
         mutable GraphiteFontAdaptor * mpFont;
         // mutable so that the DrawOffset/DrawBase can be set
         mutable GraphiteLayoutImpl maImpl;
 public:
-        GraphiteServerFontLayout(GraphiteFontAdaptor * font) throw();
+        explicit GraphiteServerFontLayout( GraphiteFontAdaptor* font ) throw();
 
         virtual bool  LayoutText( ImplLayoutArgs& rArgs) { SalLayout::AdjustLayout(rArgs); return maImpl.LayoutText(rArgs); };    // first step of layout
         virtual void  AdjustLayout( ImplLayoutArgs& rArgs)
@@ -94,7 +94,5 @@ public:
         int getMaxCharPos() const { return mnEndCharPos; }
 };
 
-
-
 #endif
 #endif //_SV_GRAPHITESERVERFONT_HXX