[ooo-build-commit] Branch 'ooo/master' - sfx2/source svx/source

[Jan Holesovsky]

 sfx2/source/appl/childwin.cxx |    3 +++
 svx/source/cui/cuicharmap.cxx |    8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 1dced42c7d3ab8c5363aa7e32df2610f5da4ae59
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Fri Jul 24 15:45:35 2009 +0000

    CWS-TOOLING: integrate CWS vcl103
    2009-07-24 Jens-Heiner Rechtien #i10000#: merge with m53
    2009-07-10 Philipp Lohmann merge
    2009-07-10 hdu #i103417# ignore non-standard font styles
    2009-07-07 Philipp Lohmann #i98789# add: Invalidate on StateChanged( STATE_CHANGE_ENABLE )
    2009-07-07 Philipp Lohmann #i102501# ExportFormFields should be persistent
    2009-07-07 Philipp Lohmann merge
    2009-07-07 Philipp Lohmann #i103319# there is no platform currently where we should beep on disabled controls
    2009-07-02 Philipp Lohmann merge
    2009-07-01 Philipp Lohmann #i93100# handle ListBox with no border a little more graceful on MacOSX
    2009-07-01 Philipp Lohmann #i101307# don't crash due to unfortunate timing
    2009-07-03 thb #i103145# Swapped HINT_DOCK for HINT_TOOLBAR for the presentation fullscreen window; anecdotal evidence suggests it works much better then for wide-spread window managers
    2009-06-30 Philipp Lohmann #i103102# evaluate Cmd-Option key combinations
    2009-06-29 Philipp Lohmann #i103148# catch exception from missing UCB (thanks thb)
    2009-06-29 hdu #i102378# fix PDF-export on PPC (thanks cloph!)
    2009-06-25 Philipp Lohmann fix another link problem
    2009-06-24 Philipp Lohmann use correct method signature
    2009-06-24 Philipp Lohmann fix a warning
    2009-06-24 Philipp Lohmann fix a warning
    2009-06-24 Philipp Lohmann #i100357# add: GDIMetaFile::GetBoundRect
    2009-06-24 Philipp Lohmann merge
    2009-06-24 hdu #i100357# extend GetTextBoundRect() to measure justified text too
    2009-06-23 Philipp Lohmann #i101108# protect writer from itself, no one could ever use paper of size (0,0)
    2009-06-22 Philipp Lohmann merge
    2009-06-22 Philipp Lohmann #i92356# treat windows running a popup menu as modal
    2009-06-22 hdu #i100000# remove sft.h again (CWS dba32b accidentially reintroduced it)
    2009-06-17 Philipp Lohmann merge
    2009-06-17 Philipp Lohmann remove warnings (thanks ericb)
    2009-06-17 Philipp Lohmann merge
    2009-06-17 Philipp Lohmann #i102133# free cursors (thanks cmc)
    2009-06-17 Philipp Lohmann #i97293# catch exception
    2009-06-17 Philipp Lohmann #i91240# fix images in menus, again
    2009-06-15 Philipp Lohmann #i100586# fix a pure virtual method (thanks cmc)
    2009-06-15 Philipp Lohmann fix an array delete issue
    2009-06-15 Philipp Lohmann #i102228# fix a cleanup issue
    2009-06-15 Philipp Lohmann #i97218# solve duplicate accelerator
    2009-06-12 hdu #i102219# avoid void*->oslGenericFunction cast for MingW (thanks tono!)

diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 7fe2e15..ae8f0e6 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -807,6 +807,9 @@ sal_Bool SfxChildWindow::QueryClose()
             bAllow = xCtrl->suspend( sal_True );
     }
 
+    if ( bAllow )
+        bAllow = !GetWindow()->IsInModalMode();
+
     return bAllow;
 }
 
diff --git a/svx/source/cui/cuicharmap.cxx b/svx/source/cui/cuicharmap.cxx
index fa962be..a66c7b3 100644
--- a/svx/source/cui/cuicharmap.cxx
+++ b/svx/source/cui/cuicharmap.cxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cuicharmap.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -405,6 +402,11 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
     USHORT nPos = aFontLB.GetSelectEntryPos(),
         nFont = (USHORT)(ULONG)aFontLB.GetEntryData( nPos );
     aFont = mpDialog->GetDevFont( nFont );
+    aFont.SetWeight( WEIGHT_DONTKNOW );
+    aFont.SetItalic( ITALIC_NONE );
+    aFont.SetWidthType( WIDTH_DONTKNOW );
+    aFont.SetPitch( PITCH_DONTKNOW );
+    aFont.SetFamily( FAMILY_DONTKNOW );
 
     // notify children using this font
     aShowSet.SetFont( aFont );