[Libreoffice-commits] .: 5 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit c7a8885a72be237bd479266cca02bb201719805f
Merge: c6c7f01... 047a986...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 25 20:58:49 2010 +0100

    Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/components

commit c6c7f01890c729d7ad2f773d285850240f4ba0f0
Merge: 8c81c96... 0fc8da2...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 25 14:26:54 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit 0fc8da254b882907c252478f6ad0b2bee6a968af
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 23 21:38:52 2010 +0100

    show the control geometric propertis correctly (bnc#610921)
    
    fix by Noel

diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 2f3faa7..6d3f3c9 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -590,7 +590,7 @@ namespace pcr
             // everything which survived the checks above should result in a factor of 1, i.e.,
             // it should have a direct counterpart as FieldUnit
             throw RuntimeException();
-        getTypedControlWindow()->SetUnit( eFieldUnit );
+        getTypedControlWindow()->MetricFormatter::SetUnit( eFieldUnit );
     }
 
     //--------------------------------------------------------------------
commit 26767cad1deb335b31bb21f9f8e4e1cd86701e7b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 23 21:18:44 2010 +0100

    show the really used default icon theme in options (bnc#603169)
    
    check also the icon theme prefered by the native widget plugin
    
    backport from ooo-build-3-2-1

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f9957cd..293cfc3 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -845,7 +845,11 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
 
         aAutoStr += ::rtl::OUString::createFromAscii( " (" );
 
-        ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
+        // prefer the icon style set by the desktop native widgets modules
+        ULONG nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle();
+        // fallback to the statically defined values
+        if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] )
+            nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
         if ( aIconStyleItemId[nAutoStyle] )
             aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );
 
commit 9f7852a1b7182060f77210d70a6fd46f7a0d949c
Author: Andras Timar <timar at fsf.hu>
Date:   Sat Nov 20 11:50:26 2010 +0100

    fixing overlapping controls

diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index d9ff1c8..60b1e4d 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -96,20 +96,20 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 
     FixedLine GB_PPOINT
     {
-        Pos = MAP_APPFONT ( 6 , 99 ) ;
+        Pos = MAP_APPFONT ( 6 , 113 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Microsoft PowerPoint 97/2000/XP";
     };
     CheckBox CB_PBAS_CODE
     {
-        Pos = MAP_APPFONT ( 12 , 110 ) ;
+        Pos = MAP_APPFONT ( 12 , 124 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Load Ba~sic code";
     };
     CheckBox CB_PBAS_STG
     {
-        Pos = MAP_APPFONT ( 12 , 124 ) ;
+        Pos = MAP_APPFONT ( 12 , 138 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Sav~e original Basic code";