[ooo-build-commit] Branch 'ooo/master' - 2 commits - sd/source

[Jan Holesovsky]

 sd/source/ui/view/PrintManager.cxx |    4 ++--
 sd/source/ui/view/drviews7.cxx     |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 56fbb0409e62b08e57c0c591a58f306d449a3d1f
Author: Oliver Bolte <obo at openoffice.org>
Date:   Tue Sep 8 10:44:42 2009 +0000

    CWS-TOOLING: integrate CWS vcl104

diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index e794538..61be799 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1328,6 +1328,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         }
     }
 
+    // #i102735# discussed with CL: removed for performance reasons
+    #if 0
     if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_SOUND ) ||
         SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_VIDEO ) )
     {
@@ -1340,6 +1342,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
         if (!SvxPluginFileDlg::IsAvailable (SID_INSERT_VIDEO))
             rSet.DisableItem (SID_INSERT_VIDEO);
     }
+    #endif
 
     ///////////////////////////////////////////////////////////////////////
     // Menuoption: Change->Convert->To Bitmap, Change->Convert->To Metafile
commit 1ae68add62f665b95b67ac8c084c59cacaef9aca
Author: Oliver Bolte <obo at openoffice.org>
Date:   Tue Sep 8 04:57:32 2009 +0000

    CWS-TOOLING: integrate CWS oj18
    2009-08-21 15:08:49 +0200 oj  r275263 : wrong check
    2009-08-21 08:56:01 +0200 oj  r275215 : missing not
    2009-08-20 07:27:13 +0200 oj  r275164 : use new method from global
    2009-08-19 10:22:35 +0200 oj  r275138 : call GetLocale instead of pLocale
    2009-08-18 10:39:32 +0200 oj  r275082 : missing header include
    2009-08-18 10:09:44 +0200 oj  r275081 : new methods at global
    2009-08-18 10:09:00 +0200 oj  r275080 : unused var
    2009-08-18 08:59:04 +0200 oj  r275078 : move files from classes to xml
    2009-08-17 14:58:16 +0200 oj  r275056 : CWS-TOOLING: rebase CWS oj18 to trunk at 275001 (milestone: DEV300:m55)
    2009-08-17 13:29:44 +0200 oj  r275047 : compile error
    2009-08-17 13:27:47 +0200 oj  r275045 : compile error
    2009-08-17 11:44:54 +0200 oj  r275040 : add dep
    2009-07-22 14:26:05 +0200 oj  r274240 : move unused services into fwl
    2009-07-22 14:25:35 +0200 oj  r274239 : move unused services into fwl
    2009-07-22 13:47:45 +0200 oj  r274233 : remove some unused code
    2009-07-22 09:06:20 +0200 oj  r274219 : export dbtoolsclient dbcharsethelper for sc
    2009-07-22 08:48:58 +0200 oj  r274218 : create NumberFormatter on demand
    2009-07-22 08:39:23 +0200 oj  r274217 : change char to sal_Char
    2009-07-22 07:33:34 +0200 oj  r274214 : export dbtoolsclient dbcharsethelper for sc
    2009-07-22 07:30:04 +0200 oj  r274213 : late init of numberformatter and breakiterator
    2009-07-22 07:28:55 +0200 oj  r274212 : export dbtoolsclient dbcharsethelper for sc
    2009-07-21 13:43:28 +0200 oj  r274196 : check if quick start is enbaled
    2009-07-21 13:40:09 +0200 oj  r274195 : check config entry for UiEventsLogger
    2009-07-21 13:37:40 +0200 oj  r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
    2009-07-21 13:35:38 +0200 oj  r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
    2009-07-21 13:33:41 +0200 oj  r274192 : doc meta data will now be created on demand
    2009-07-21 13:13:40 +0200 oj  r274187 : load ldap functions on demand
    2009-07-21 13:03:17 +0200 oj  r274183 : late init of TransliterationImpl
    2009-07-21 12:36:10 +0200 oj  r274180 : late init of charClass

diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx
index 633a508..0ac0e4e 100644
--- a/sd/source/ui/view/PrintManager.cxx
+++ b/sd/source/ui/view/PrintManager.cxx
@@ -368,12 +368,12 @@ USHORT  PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p
 
             if( pPrintOpts->GetOptionsPrint().IsDate() )
             {
-                aTimeDateStr += GetSdrGlobalData().pLocaleData->getDate( Date() );
+                aTimeDateStr += GetSdrGlobalData().GetLocaleData()->getDate( Date() );
                 aTimeDateStr += (sal_Unicode)' ';
             }
 
             if( pPrintOpts->GetOptionsPrint().IsTime() )
-                aTimeDateStr += GetSdrGlobalData().pLocaleData->getTime( Time(), FALSE, FALSE );
+                aTimeDateStr += GetSdrGlobalData().GetLocaleData()->getTime( Time(), FALSE, FALSE );
 
             if( pPrintOpts->GetOptionsPrint().IsOutline() )
                 bPrintOutline = TRUE;