[Libreoffice-commits] .: sw/source

[Tor Lillqvist]

 sw/source/ui/config/optpage.cxx |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 793b87411646a4a008a6ed82315d8b5c82738641
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date:   Sat Mar 3 22:02:23 2012 +0100

    Fix fdo#38207 and also hide another option in Writer/Web

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 014f04d..89cb4eb 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1287,15 +1287,27 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet)
     // hide certain controls for html
     if(bHTMLMode)
     {
-
+        aRepeatHeaderCB.Hide();
         aDontSplitCB.Hide();
+
+        long nMoveUpBy =
+        aRepeatHeaderCB.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
+
+        Point aPos = aRepeatHeaderCB.GetPosPixel();
+        aRepeatHeaderCB.SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
+
+        nMoveUpBy +=
+        aDontSplitCB.LogicToPixel( Size( 13, 13 ), MAP_APPFONT ).Height();
+
+        aPos = aBorderCB.GetPosPixel();
+        aBorderCB.SetPosPixel( Point( aPos.X(), aPos.Y() - nMoveUpBy ) );
     }
 
     SwInsertTableOptions aInsOpts = pModOpt->GetInsTblFlags(bHTMLMode);
     sal_uInt16 nInsTblFlags = aInsOpts.mnInsMode;
 
     aHeaderCB.Check(0 != (nInsTblFlags & tabopts::HEADLINE));
-    aRepeatHeaderCB.Check(aInsOpts.mnRowsToRepeat > 0);
+    aRepeatHeaderCB.Check((!bHTMLMode) && (aInsOpts.mnRowsToRepeat > 0));
     aDontSplitCB.Check(!(nInsTblFlags & tabopts::SPLIT_LAYOUT));
     aBorderCB.Check(0 != (nInsTblFlags & tabopts::DEFAULT_BORDER));