summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-03 10:53:26 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-03 10:53:26 +0000
commit89892e061f54abca94cd6725aeb3c989c379fb57 (patch)
tree41904f85a6dd16a8ea43a8bf2fe52428ffaac8ec /vcl
parent95adce37033d028609a3f870ebc8cdd0732c1968 (diff)
INTEGRATION: CWS calcrtl (1.157.6); FILE MERGED
2004/01/13 10:18:02 sab 1.157.6.3: RESYNC: (1.160-1.164); FILE MERGED 2003/11/27 10:50:43 nn 1.157.6.2: RESYNC: (1.157-1.160); FILE MERGED 2003/11/10 10:22:09 ssa 1.157.6.1: #106948# improved mirroring
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/outdev3.cxx17
1 files changed, 13 insertions, 4 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 619c24ec2874..391706a11d63 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: outdev3.cxx,v $
*
- * $Revision: 1.165 $
+ * $Revision: 1.166 $
*
- * last change: $Author: hr $ $Date: 2004-02-02 18:21:55 $
+ * last change: $Author: hr $ $Date: 2004-02-03 11:53:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -204,6 +204,9 @@ using namespace ::vcl;
// =======================================================================
+//#ifdef USE_NEW_RTL_IMPLEMENTATION
+
+
static void ImplRotatePos( long nOriginX, long nOriginY, long& rX, long& rY,
int nOrientation )
{
@@ -4515,9 +4518,15 @@ void OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout, BOOL bTextLines )
rSalLayout.DrawBase().X() = w - 1 - x;
if( !IsRTLEnabled() )
{
+ OutputDevice *pOutDevRef = (OutputDevice *)this;
+#ifdef USE_NEW_RTL_IMPLEMENTATION
+ if( meOutDevType == OUTDEV_WINDOW )
+ pOutDevRef = (OutputDevice*) ((Window *) this)->mpDummy4;
+#endif
+
// mirror this window back
- long devX = w-mnOutWidth-mnOutOffX; // re-mirrored mnOutOffX
- rSalLayout.DrawBase().X() = devX + ( mnOutWidth - 1 - (rSalLayout.DrawBase().X() - devX) ) ;
+ long devX = w-pOutDevRef->mnOutWidth-pOutDevRef->mnOutOffX; // re-mirrored mnOutOffX
+ rSalLayout.DrawBase().X() = devX + ( pOutDevRef->mnOutWidth - 1 - (rSalLayout.DrawBase().X() - devX) ) ;
}
}