[Libreoffice-commits] .: 2 commits - sfx2/source svx/source

[Michael Meeks]

 sfx2/source/view/viewfrm.cxx  |    1 +
 svx/source/dialog/fntctrl.cxx |   12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit ec28648adf791405314f86954f519f51af853edb
Author: Júlio Hoffimann <julio.hoffimann at gmail.com>
Date:   Sun Apr 10 22:54:26 2011 -0300

    not useful dates in source code removed

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index a34cae1..cae2c74 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -200,13 +200,13 @@ inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const
 
 // class FontPrevWin_Impl -----------------------------------------------
 
-/*-----------------19.7.2001 08:44------------------
+/*
  * void FontPrevWin_Impl::_CheckScript()
  * evalutates the scripttypes of the actual string.
  * Afterwards the positions of script change are notified in aScriptChg,
  * the scripttypes in aScriptType.
  * The aTextWidth array will be filled with zero.
- * --------------------------------------------------*/
+ */
 
 void FontPrevWin_Impl::_CheckScript()
 {
@@ -271,7 +271,7 @@ void FontPrevWin_Impl::_CheckScript()
     }
 }
 
-/*-----------------19.7.2001 08:48------------------
+/*
  * Size FontPrevWin_Impl::CalcTextSize(..)
  * fills the aTextWidth array with the text width of every part
  * of the actual string without a script change inside.
@@ -279,7 +279,7 @@ void FontPrevWin_Impl::_CheckScript()
  * for Asian parts the aCJKFont.
  * The returned size contains the whole string.
  * The member nAscent is calculated to the maximal ascent of all used fonts.
- * --------------------------------------------------*/
+ */
 
 Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter,
     SvxFont &rFont )
@@ -352,12 +352,12 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
     return aTxtSize;
 }
 
-/*-----------------19.7.2001 08:54------------------
+/*
  * void FontPrevWin_Impl::DrawPrev(..)
  * calls SvxFont::DrawPrev(..) for every part of the string without a script
  * change inside, for Asian parts the aCJKFont will be used, otherwise the
  * given rFont.
- * --------------------------------------------------*/
+ */
 
 void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
     Point &rPt, SvxFont &rFont )
commit 78933a892ff105253e70bfa26362549c141be0fc
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Apr 7 13:55:17 2011 +0100

    hide macro recording when it is not enabled, to reduce confusion

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 19c3d25..0c815ab 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3111,6 +3111,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                          ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) )
                     {
                         rSet.DisableItem( nWhich );
+                        rSet.Put(SfxVisibilityItem(nWhich, sal_False));
                         break;
                     }