CWS-TOOLING: integrate CWS os121

2008-11-28 13:44:51 +0100 os  r264551 : Copy Hyperlink Location added
2008-11-28 13:36:20 +0100 os  r264547 : Copy Hyperlink Location added
2008-11-25 15:43:53 +0100 os  r264311 : label of EditHyperlink fixed
2008-11-25 15:42:42 +0100 os  r264310 : use ResetAttr to remove hyperlink
2008-11-25 10:08:02 +0100 os  r264276 : edit/remove hyperlink names fixed
2008-11-11 15:47:22 +0100 os  r263565 : typo fixed
2008-11-10 18:46:00 +0100 os  r263536 : CWS-TOOLING: rebase CWS os121 to trunk@263288 (milestone: DEV300:m35)
2008-11-07 15:34:41 +0100 os  r263422 : #i6191# accept/reject changes;#i7311# remove hyperlink
2008-11-07 15:34:05 +0100 os  r263421 : #i6191# accept/reject changes;#i7311# remove hyperlink
2008-11-06 17:26:18 +0100 os  r263402 : #i43971# words from online help documents must not be added to AutoCompletion
2008-11-06 16:08:27 +0100 os  r263397 : #i6191# accept/reject changes added to context menu
2008-11-06 16:07:49 +0100 os  r263396 : #i6191# accept/reject changes added to context menu
2008-11-06 16:07:16 +0100 os  r263395 : #i6191# accept/reject changes added to context menu
2008-11-06 16:06:18 +0100 os  r263394 : #i6191# accept/reject changes added to context menu
2008-10-30 14:31:32 +0100 os  r262826 : #i84980# less options changed to fewer options
2008-10-30 11:44:41 +0100 os  r262824 : #i95624# don't add paragraph numbering in getString()
2008-10-27 10:46:04 +0100 os  r262665 : #i88235# SvCheckListBox::SelectEntryPos() paints a CheckBox to the wrong device if page is not visible, yet - call moved to ::Reset()
2008-10-24 15:49:27 +0200 os  r262648 : #i77230# make repeating headers the default
2008-10-23 16:49:42 +0200 os  r262625 : #i95350# RTL output of table window fixed
2008-10-23 15:37:40 +0200 os  r262623 : #i76723# RTL related patch removed - it is now done by vcl
2008-10-22 14:05:58 +0200 os  r262601 : #b6297019#,#i49754# LoadStyles: restore outline settings
2008-10-22 14:05:17 +0200 os  r262600 : #b6297019#,#i49754# LoadStyles: restore outline settings
2008-10-20 15:39:18 +0200 os  r262323 : #i95059# border attribute: which id of SID_ATTR_BORDER_INNER fixed
2008-10-20 09:30:28 +0200 os  r262305 : #i95123# conflict css::util::Color and ::Color solved
2008-10-17 11:44:16 +0200 os  r262280 : #i93714# merge to PDF: convert fields to text before export
2008-10-17 10:30:11 +0200 os  r262275 : #i94364#
2008-10-17 10:11:56 +0200 os  r262274 : +i94536# default font ListBoxes: prevent entry duplication if 'Back' button is pressed

7 files changed, 41 insertions, 60 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index eb503624cf2e..ce73a4b9496a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -225,6 +225,26 @@
                     <value xml:lang="en-US">H~yperlink</value>
                 </prop>
             </node>
+            <node oor:name=".uno:RemoveHyperlink" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Remove Hyperlink</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:CopyHyperlinkLocation" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Copy Hyperlink Location</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:AcceptChange" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Accept Change</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:RejectChange" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Reject Change</value>
+                </prop>
+            </node>
             <node oor:name=".uno:InsertBookmark" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Bookmar~k...</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index 1f3ca0b71bf1..8427fc22d17f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -191,6 +191,11 @@
         </node>
       </node>
     </node>
+    <node oor:name="Table">
+        <prop oor:name="RepeatHeader" oor:type="xs:boolean">
+         <value>true</value>
+        </prop>
+    </node>
   </node>
  <node oor:name="Wizards">
   <node oor:name="Letter">
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index bad88070741d..bb80d3dd588e 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -535,10 +535,10 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
         // nur die n"otigen Items f"uer Umrandung und Hintergrund benutzen
         USHORT nBrush = GetWhich( SID_ATTR_BRUSH );
         USHORT nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
-        USHORT nInner = GetWhich( SID_ATTR_BORDER_INNER );
+        USHORT nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
         USHORT nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
 
-        // einen leeren Set erzeugen
+        // einen leeren Set erzeugenc
         pBBSet = new SfxItemSet( *GetItemSet().GetPool(), nBrush, nBrush,
                                  nOuter, nOuter, nInner, nInner,
                                  nShadow, nShadow, 0 );
diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src
index 8c4a92c69e15..408daa130bb9 100644
--- a/svx/source/dialog/srchdlg.src
+++ b/svx/source/dialog/srchdlg.src
@@ -399,7 +399,7 @@ ModelessDialog RID_SVXDLG_SEARCH
     };
     String STR_LESS_BTN
     {
-        Text [ en-US ] = "Less ~Options" ;
+        Text [ en-US ] = "Fewer ~Options" ;
     };
 };
 
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 4a1c6902188d..39a0703ea1b2 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -156,21 +156,8 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
     else
     {
         pVDev->SetFont(rTextFont);
-        if (Application::GetSettings().GetLayoutRTL())
-        {
-            String  sTmpText(rText);
-            sTmpText.Reverse();
-            for(sal_uInt16 j = 0; j < sTmpText.Len(); j++)
-                sTmpText.SetChar(j, static_cast< sal_Unicode>(GetMirroredChar(sTmpText.GetChar(j))));
-            OUString osTmpText(sTmpText);
-                pVDev->DrawText(rLeft, osTmpText);
-                rLeft.X() += pVDev->GetTextWidth(osTmpText);
-        }
-        else
-        {
-                pVDev->DrawText(rLeft, rText);
-                rLeft.X() += pVDev->GetTextWidth(rText);
-        }
+        pVDev->DrawText(rLeft, rText);
+        rLeft.X() += pVDev->GetTextWidth(rText);
     }
 }
 void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
@@ -285,12 +272,6 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
                         rValue.Name = sValue;
                         rValue.Value <<= (sal_Int32)(i + 1);
                         sText = xFormatter->makeNumberingString( aLevel, aLocale );
-                        if (Application::GetSettings().GetLayoutRTL())
-                        {
-                            sText.Reverse();
-                            for(sal_uInt16 j = 0; j < sText.Len(); j++)
-                                sText.SetChar(j, static_cast< sal_Unicode>(GetMirroredChar(sText.GetChar(j))));
-                        }
                     }
                     catch(Exception&)
                     {
@@ -375,20 +356,8 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
                         sPrefixes[i].getStr()[0] != 0)
                     {
                         pVDev->SetFont(aFont);
-                        if (Application::GetSettings().GetLayoutRTL())
-                        {
-                            String  sTmpPref(sPrefixes[i]);
-                            for(sal_uInt16 j = 0; j < sTmpPref.Len(); j++)
-                                sTmpPref.SetChar(j, static_cast< sal_Unicode>(GetMirroredChar(sTmpPref.GetChar(j))));
-                            OUString osTmpPref(sTmpPref);
-                                        pVDev->DrawText(aLeft, osTmpPref);
-                                        aLeft.X() += pDev->GetTextWidth(osTmpPref);
-                        }
-                        else
-                        {
-                                        pVDev->DrawText(aLeft, sPrefixes[i]);
-                                        aLeft.X() += pDev->GetTextWidth(sPrefixes[i]);
-                        }
+                        pVDev->DrawText(aLeft, sPrefixes[i]);
+                        aLeft.X() += pDev->GetTextWidth(sPrefixes[i]);
                     }
                     if(aParentNumberings[i])
                     {
@@ -421,20 +390,8 @@ void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
                         sSuffixes[i].getStr()[0] != 0)
                     {
                         pVDev->SetFont(aFont);
-                        if (Application::GetSettings().GetLayoutRTL())
-                        {
-                            String  sTmpSuff(sSuffixes[i]);
-                            for( sal_uInt16 j = 0; j < sTmpSuff.Len(); j++)
-                                sTmpSuff.SetChar(j, static_cast< sal_Unicode>(GetMirroredChar(sTmpSuff.GetChar(j))));
-                            OUString osTmpSuff(sTmpSuff);
-                                        pVDev->DrawText(aLeft, osTmpSuff);
-                                        aLeft.X() += pDev->GetTextWidth(osTmpSuff);
-                        }
-                        else
-                        {
-                                        pVDev->DrawText(aLeft, sSuffixes[i]);
-                                        aLeft.X() += pDev->GetTextWidth(sSuffixes[i]);
-                        }
+                        pVDev->DrawText(aLeft, sSuffixes[i]);
+                        aLeft.X() += pDev->GetTextWidth(sSuffixes[i]);
                     }
 
                     long nLineTop = nStartY + nRectHeight * aLinesArr[2 * i + 1]/100 ;
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index ee4d62dd950c..74c4d2a55e86 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -413,14 +413,13 @@ void TableWindow::Paint( const Rectangle& )
         aText = Button::GetStandardText( BUTTON_CANCEL );
     Size aTextSize( GetTextWidth( aText ), GetTextHeight() );
 
-    //#i72805# prevent damaged table dimension text
-    sal_Bool bWasRTL = IsRTLEnabled();
-    EnableRTL( sal_False );
-    DrawText( Point( (aSize.Width() - aTextSize.Width()) / 2, aSize.Height() - nTextHeight + 2 ), aText );
-    EnableRTL( bWasRTL );
+    Rectangle aClearRect( 0, aSize.Height()-nTextHeight+2, (aSize.Width()), aSize.Height() );
+    DrawRect( aClearRect );
 
-    DrawRect( Rectangle( 0, aSize.Height()-nTextHeight+2, (aSize.Width()-aTextSize.Width())/2-1, aSize.Height() ) );
-    DrawRect( Rectangle( (aSize.Width()-aTextSize.Width())/2+aTextSize.Width(), aSize.Height()-nTextHeight+2, aSize.Width(), aSize.Height() ) );
+    // #i95350# force RTL output
+    if( IsRTLEnabled() &&   nCol && nLine )
+        aText.Insert(0x202D, 0);
+    DrawText( Point( (aSize.Width() - aTextSize.Width()) / 2, aSize.Height() - nTextHeight + 2 ), aText );
 
     SetLineColor( aLineColor );
     SetFillColor();
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 4f8f0454bc7a..bfb155353c22 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1517,7 +1517,7 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
 {
     if ( ( mpOutlineStylesCandidates != NULL || bSetEmptyLevels ) &&
          xChapterNumbering.is() &&
-         !( IsInsertMode() || IsStylesOnlyMode() ) )
+         !IsInsertMode() )
     {
         // --> OD 2007-12-19 #152540#
         bool bChooseLastOne( false );