[Libreoffice-commits] .: 3 commits - svx/source sw/inc sw/source

[Libreoffice Gerrit user]

 svx/source/tbxctrls/tbcontrl.cxx |    2 +-
 sw/inc/fesh.hxx                  |    2 +-
 sw/source/ui/utlui/poolfmt.src   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a08f4a983de1170d9d2cc3490a392469886980cd
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Sun Nov 25 19:07:28 2012 +0100

    Apply Style: Fix the styles preview on Windows.
    
    Change-Id: Ic684e52df585add9ff0f068fa4871ada3916be16

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3e0ed94..88f8b1c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -571,7 +571,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
             {
                 OutputDevice *pDevice = rUDEvt.GetDevice();
 
-                Size aFontSize( pFontHeightItem->GetHeight(), pFontHeightItem->GetHeight() );
+                Size aFontSize( 0, pFontHeightItem->GetHeight() );
                 Size aPixelSize( pDevice->LogicToPixel( aFontSize, pShell->GetMapUnit() ) );
 
                 // setup the font properties
commit 7bddbf6b972dff1c9caeb4d4fb485b93c4cb9353
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Sun Nov 25 17:27:32 2012 +0100

    Fix doxygen comment.
    
    Change-Id: Ia08f5da3e1da257b7d45ffefbd14cf474ee5a95f

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 8f88f4a..1ca2e68 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -101,7 +101,7 @@ namespace svx
 #define FLYPROTECT_SIZE         (sal_uInt16)  2
 #define FLYPROTECT_POS          (sal_uInt16)  4
 #define FLYPROTECT_PARENT       (sal_uInt16)  8     ///< Check only parents.
-#define FLYPROTECT_FIXED        (sal_uInt16) 16     /** Only protection that cannot be withdrawn
+#define FLYPROTECT_FIXED        (sal_uInt16) 16     /**< Only protection that cannot be withdrawn
                                                     e.g. by OLE-server; also relevant for dialog. */
 
 // For figuring out contents by position (D&D)
commit 2e4f4171d6a29858108922619d680606b633d8f2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Sun Nov 25 17:20:47 2012 +0100

    "Default Style" is better name than just "Default" for page styles too.
    
    Change-Id: I82ca81ed34db3ba79233534bc5616196ccde7276

diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src
index f20c110..aa2e6e7 100644
--- a/sw/source/ui/utlui/poolfmt.src
+++ b/sw/source/ui/utlui/poolfmt.src
@@ -647,7 +647,7 @@ String STR_POOLCOLL_HTML_DT
 //page style names
 String STR_POOLPAGE_STANDARD
 {
-    Text [ en-US ] = "Default" ;
+    Text [ en-US ] = "Default Style" ;
 };
 String STR_POOLPAGE_FIRST
 {