[ooo-build-commit] Branch 'ooo/master' - 2 commits - sw/source

[Jan Holesovsky]

 sw/source/core/text/porlay.cxx  |    2 +-
 sw/source/filter/ww8/ww8par.cxx |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ddcd8a04e71378854ae4b206698428773d27cd1a
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Sep 9 11:16:06 2009 +0000

    #i10000# use GetBreakIter() instead of xBreak

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 5096f14..da275d1 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1031,7 +1031,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         // special case for dotted circle since it can be used with complex
         // before a mark, so we want it associated with the mark's script
         if (nChg < rTxt.Len() && nChg > 0 && (i18n::ScriptType::WEAK ==
-            pBreakIt->xBreak->getScriptType(rTxt,nChg - 1)))
+            pBreakIt->GetBreakIter()->getScriptType(rTxt,nChg - 1)))
         {
             int8_t nType = u_charType(rTxt.GetChar(nChg) );
             if (nType == U_NON_SPACING_MARK || nType == U_ENCLOSING_MARK ||
commit 73c1636eea7527405d1ec5205bccd687140967df
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Sep 9 09:19:53 2009 +0000

    CWS-TOOLING: integrate CWS impress174
    2009-08-27 18:21:38 +0200 af  r275502 : #i73289# Fixed detection of the cases when the layout menu is be disabled.
    2009-08-24 17:45:50 +0200 sj  r275326 : #i103360# only setting filltype if there is also a correct fill element
    2009-08-24 16:11:06 +0200 cl  r275322 : #i73871# only remove replaced objects from mark list if replaced by SdrEditView::ReplaceObjectAtView(). see issue for reason
    2009-08-24 15:03:33 +0200 cl  r275319 : fixed merge error
    2009-08-20 12:45:29 +0200 sj  r275174 : CWS-TOOLING: rebase CWS impress174 to trunk at 275001 (milestone: DEV300:m55)
    2009-08-19 15:54:47 +0200 sj  r275153 : #158486# text of flipped shapes is not flipped in word
    2009-08-17 17:30:16 +0200 sj  r275063 : #158486# also correcting text bound for additional text rotation
    2009-08-05 11:09:32 +0200 sj  r274643 : #i102797# adapted customshape coloring (fixed fontwork)
    2009-08-04 14:17:36 +0200 sj  r274620 : #i99501# pdf export: fixed export of rotated graphics
    2009-07-30 16:15:44 +0200 sj  r274494 : #158653# binary ppt import: fixed table border lines
    2009-07-27 18:28:02 +0200 sj  r274376 : added shape text clipping for customshapes
    2009-07-20 18:09:14 +0200 sj  r274154 : #i101918# fixed gallery preview (now taking the correct mapmode)
    2009-07-13 18:00:58 +0200 cl  r273948 : #i103238# clear hard set attributes only if new style set is manually applied
    2009-07-13 17:58:07 +0200 cl  r273947 : #i73289# do not expand a toolpanel when it gets enabled
    2009-07-08 12:39:49 +0200 sj  r273827 : #i101566# applied patch from cmc to solve font width inconsistencies
    2009-07-08 12:11:13 +0200 sj  r273826 : #i87727# added PDFDialog service
    2009-07-06 17:22:40 +0200 sj  r273755 : #i103360# fixed a merge problem, no more looping when loading transparence gradients on background page
    2009-07-03 14:42:07 +0200 sj  r273701 : #102797# added patch from thb (Adapted customshape coloring)
    2009-07-03 14:09:44 +0200 sj  r273696 : #102797# removed warning
    2009-07-03 14:01:47 +0200 sj  r273695 : #102797# added patch from thb (Adapted customshape coloring)
    2009-07-03 13:13:39 +0200 sj  r273688 : #102797# added patch from thb (Adapted customshape coloring)
    2009-07-03 11:25:30 +0200 sj  r273684 : #i103278# fixed import of lines
    2009-07-01 16:23:47 +0200 cl  r273599 : #i96820# correctly call setChanged on model if table is modified
    2009-07-01 14:43:09 +0200 cl  r273588 : #i8770# Patch: fix missing type provider for pdf export dialog
    2009-07-01 14:40:28 +0200 cl  r273586 : #i73871# activate picture bar after converting shape to bitmap
    2009-07-01 14:39:05 +0200 cl  r273584 : #i73871# activate picture bar after converting shape to bitmap
    2009-07-01 14:04:53 +0200 cl  r273578 : #i73289# PATCH: Disable layout pane on the masterslide

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f406be6..67fd6bb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -597,7 +597,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
                 }
             }
 
-            if ( ( mnFix16Angle || nTextRotationAngle ) && dynamic_cast< SdrObjCustomShape* >( pObj ) )
+            if ( ( ( rObjData.nSpFlags & SP_FFLIPV ) || mnFix16Angle || nTextRotationAngle ) && dynamic_cast< SdrObjCustomShape* >( pObj ) )
             {
                 SdrObjCustomShape* pCustomShape = dynamic_cast< SdrObjCustomShape* >( pObj );
 
@@ -606,6 +606,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
                 {	// text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false
                     fExtraTextRotation = -mnFix16Angle;
                 }
+                if ( rObjData.nSpFlags & SP_FFLIPV )	// sj: in ppt the text is flipped, whereas in word the text
+                {										// remains unchanged, so we have to take back the flipping here
+                    fExtraTextRotation += 18000.0;		// because our core will flip text if the shape is flipped.
+                }
                 fExtraTextRotation += nTextRotationAngle;
                 if ( !::basegfx::fTools::equalZero( fExtraTextRotation ) )
                 {