#i39532# RTL and BiDi support

2 files changed, 29 insertions, 16 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
index 0a73de3b6187..0d0775f6a4c6 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: textprimitive2d.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: aw $ $Date: 2007-10-01 09:13:53 $
+ *  last change: $Author: aw $ $Date: 2007-10-02 16:54:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -72,15 +72,17 @@ namespace drawinglayer
         {
         private:
             // core data
-            String                                      maFamilyName;
-            String                                      maStyleName;
-            sal_uInt16                                  mnWeight;
+            String                                      maFamilyName;       // Font Family Name
+            String                                      maStyleName;        // Font Style Name
+            sal_uInt16                                  mnWeight;           // Font weight
 
             // bitfield
-            unsigned                                    mbSymbol : 1;
-            unsigned                                    mbVertical : 1;
-            unsigned                                    mbItalic : 1;
-            unsigned                                    mbOutline : 1;
+            unsigned                                    mbSymbol : 1;       // Symbol Font Flag
+            unsigned                                    mbVertical : 1;     // Vertical Text Flag
+            unsigned                                    mbItalic : 1;       // Italic Flag
+            unsigned                                    mbOutline : 1;      // Outline Flag
+            unsigned                                    mbRTL : 1;          // RTL Flag
+            unsigned                                    mbBiDiStrong : 1;   // BiDi Flag
             // TODO: pair kerning and CJK kerning
 
         public:
@@ -91,14 +93,18 @@ namespace drawinglayer
                 bool bSymbol = false,
                 bool bVertical = false,
                 bool bItalic = false,
-                bool bOutline = false)
+                bool bOutline = false,
+                bool bRTL = false,
+                bool bBiDiStrong = false)
             :   maFamilyName(rFamilyName),
                 maStyleName(rStyleName),
                 mnWeight(nWeight),
                 mbSymbol(bSymbol),
                 mbVertical(bVertical),
                 mbItalic(bItalic),
-                mbOutline(bOutline)
+                mbOutline(bOutline),
+                mbRTL(bRTL),
+                mbBiDiStrong(bBiDiStrong)
             {
             }
 
@@ -113,12 +119,14 @@ namespace drawinglayer
             bool getVertical() const { return mbVertical; }
             bool getItalic() const { return mbItalic; }
             bool getOutline() const { return mbOutline; }
+            bool getRTL() const { return mbRTL; }
+            bool getBiDiStrong() const { return mbBiDiStrong; }
         };
 
         // helper methods for vcl font
         Font getVclFontFromFontAttributes(const FontAttributes& rFontAttributes, const basegfx::B2DVector& rFontSize, double fFontRotation);
         Font getVclFontFromFontAttributes(const FontAttributes& rFontAttributes, const basegfx::B2DHomMatrix& rTransform);
-        FontAttributes getFontAttributesFromVclFont(basegfx::B2DVector& rSize, const Font& rFont);
+        FontAttributes getFontAttributesFromVclFont(basegfx::B2DVector& rSize, const Font& rFont, bool bRTL, bool bBiDiStrong);
 
     } // end of namespace primitive2d
 } // end of namespace drawinglayer
diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
index e80c28a248ca..df0128b1928b 100644
--- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: vclmetafileprocessor2d.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: aw $ $Date: 2007-08-06 14:14:46 $
+ *  last change: $Author: aw $ $Date: 2007-10-02 16:54:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -79,8 +79,13 @@ namespace drawinglayer
         {
         private:
             // local helper(s)
-            Rectangle impDumpToMetaFile(const primitive2d::Primitive2DSequence& rContent, GDIMetaFile& o_rContentMetafile);
-            void impConvertFillGradientAttributeToVCLGradient(Gradient& o_rVCLGradient, const attribute::FillGradientAttribute& rFiGrAtt);
+            Rectangle impDumpToMetaFile(
+                const primitive2d::Primitive2DSequence& rContent,
+                GDIMetaFile& o_rContentMetafile);
+            void impConvertFillGradientAttributeToVCLGradient(
+                Gradient& o_rVCLGradient,
+                const attribute::FillGradientAttribute& rFiGrAtt,
+                bool bIsTransparenceGradient);
             void impStartSvtGraphicFill(SvtGraphicFill* pSvtGraphicFill);
             void impEndSvtGraphicFill(SvtGraphicFill* pSvtGraphicFill);
             SvtGraphicStroke* impTryToCreateSvtGraphicStroke(