summaryrefslogtreecommitdiff
path: root/drawinglayer/source/primitive2d/textprimitive2d.cxx
diff options
context:
space:
mode:
authorArmin Weiss <aw@openoffice.org>2007-10-02 15:55:00 +0000
committerArmin Weiss <aw@openoffice.org>2007-10-02 15:55:00 +0000
commit941811c2fb8ea4ff64e866863ecb39bbbdc48160 (patch)
tree5c0dcf2024c32f56c00e365b222167a4b50d273f /drawinglayer/source/primitive2d/textprimitive2d.cxx
parent6e633ad0a710a4e4a3c68f87c462b32ccc6d4fe2 (diff)
#i39532# RTL and BiDi support
Diffstat (limited to 'drawinglayer/source/primitive2d/textprimitive2d.cxx')
-rw-r--r--drawinglayer/source/primitive2d/textprimitive2d.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index c659b5e7bc59..d11a75ac5116 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: textprimitive2d.cxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: aw $ $Date: 2007-10-01 09:14:08 $
+ * last change: $Author: aw $ $Date: 2007-10-02 16:55:00 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -71,7 +71,9 @@ namespace drawinglayer
&& getSymbol() == rCompare.getSymbol()
&& getVertical() == rCompare.getVertical()
&& getItalic() == rCompare.getItalic()
- && getOutline() == rCompare.getOutline());
+ && getOutline() == rCompare.getOutline()
+ && getRTL() == rCompare.getRTL()
+ && getBiDiStrong() == rCompare.getBiDiStrong());
}
} // end of namespace primitive2d
} // end of namespace drawinglayer
@@ -122,7 +124,7 @@ namespace drawinglayer
return aRetval;
}
- FontAttributes getFontAttributesFromVclFont(basegfx::B2DVector& rSize, const Font& rFont)
+ FontAttributes getFontAttributesFromVclFont(basegfx::B2DVector& rSize, const Font& rFont, bool bRTL, bool bBiDiStrong)
{
FontAttributes aRetval(
rFont.GetName(),
@@ -131,7 +133,9 @@ namespace drawinglayer
RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet(),
rFont.IsVertical(),
ITALIC_NONE != rFont.GetItalic(),
- rFont.IsOutline());
+ rFont.IsOutline(),
+ bRTL,
+ bBiDiStrong);
// TODO: eKerning
const sal_Int32 nWidth(rFont.GetSize().getWidth());