CWS-TOOLING: integrate CWS unifypaper01

2009-05-27 17:14:41 +0200 cmc  r272362 : #i92819#, psprint moved into vcl
2009-05-19 15:45:46 +0200 cmc  r272083 : #i92819# having difficultly in getting this right under windows
2009-05-18 18:04:22 +0200 cmc  r272043 : #i92819# missing some export magic somewhere
2009-05-18 15:34:18 +0200 cmc  r272028 : #i92819# get depends right
2009-05-18 11:50:43 +0200 cmc  r272010 : ##i92819# fix import/export stuff
2009-05-18 10:07:00 +0200 cmc  r272000 : #i92819# fix window imp name
2009-05-16 15:17:23 +0200 cmc  r271975 : #i92819# fix win paper names
2009-05-16 11:11:29 +0200 cmc  r271974 : #i92819# std::abs prolematic for msvc
2009-05-15 15:36:56 +0200 cmc  r271941 : #i92819# handle missing setting, at least on mac
2009-05-15 10:13:44 +0200 cmc  r271927 : #i92819# adjust for moved page dialog
2009-05-14 13:47:14 +0200 cmc  r271887 : remove dead files that reappeared
2009-05-14 09:57:17 +0200 cmc  r271872 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@271830 (milestone: DEV300:m48)
2009-05-11 12:27:18 +0200 cmc  r271763 : #i92819# check return value
2009-05-06 17:28:25 +0200 cmc  r271602 : #i92819# these B4/B5s are the JIS ones according to their dimensions
2009-05-06 17:17:03 +0200 cmc  r271601 : #i92819# micro-optimization
2009-05-03 18:20:48 +0200 cmc  r271434 : #i92819# paper libs
2009-05-03 16:08:32 +0200 cmc  r271433 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@271427 (milestone: DEV300:m47)
2009-04-06 15:33:37 +0200 cmc  r270556 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@270033 (milestone: DEV300:m45)
2009-03-12 14:36:35 +0100 cmc  r269415 : #i92819# merge paper utilities
2009-03-11 13:44:27 +0100 cmc  r269328 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@269297 (milestone: DEV300:m43)
2009-03-09 14:42:07 +0100 cmc  r269190 : remove config_office from synced version
2009-03-09 14:34:50 +0100 cmc  r269187 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@268395 (milestone: DEV300:m42)
2009-03-09 12:11:29 +0100 cmc  r269077 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@265758 (milestone: DEV300:m38)
2009-03-06 17:17:39 +0100 cmc  r269027 : #i92819# paper goo
2008-12-04 11:29:30 +0100 cmc  r264826 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@264807 (milestone: DEV300:m37)
2008-11-26 10:33:06 +0100 cmc  r264357 : CWS-TOOLING: rebase CWS unifypaper01 to trunk@264325 (milestone: DEV300:m36)
2008-11-21 14:09:36 +0100 cmc  r264138 : #i92819# paper consolidation

1 files changed, 2 insertions, 26 deletions

diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 0bf2b7ed47dd..ed6e5b6bd23f 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -862,30 +862,6 @@ sal_Int32 SAL_CALL SmModel::getRendererCount(
     return 1;
 }
 
-
-static Size lcl_GuessPaperSize()
-{
-    Size aRes;
-    Reference< XMultiServiceFactory >  xMgr( getProcessServiceFactory() );
-    LocaleDataWrapper aLocWrp( xMgr, AllSettings().GetLocale() );
-    if( MEASURE_METRIC == aLocWrp.getMeasurementSystemEnum() )
-    {
-        // in Twip
-        aRes.Width()  = lA4Width;
-        aRes.Height() = lA4Height;
-    }
-    else
-    {
-        // in Twip
-        aRes.Width()  = lLetterWidth;
-        aRes.Height() = lLetterHeight;
-    }
-    aRes = OutputDevice::LogicToLogic( aRes, MapMode(MAP_TWIP),
-                                             MapMode(MAP_100TH_MM) );
-    return aRes;
-}
-
-
 uno::Sequence< beans::PropertyValue > SAL_CALL SmModel::getRenderer(
         sal_Int32 nRenderer,
         const uno::Any& /*rSelection*/,
@@ -909,7 +885,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SmModel::getRenderer(
     // if paper size is 0 (usually if no 'real' printer is found),
     // guess the paper size
     if (aPrtPaperSize.Height() == 0 || aPrtPaperSize.Width() == 0)
-        aPrtPaperSize = lcl_GuessPaperSize();
+        aPrtPaperSize = SvxPaperInfo::GetDefaultPaperSize(MAP_100TH_MM);
     awt::Size   aPageSize( aPrtPaperSize.Width(), aPrtPaperSize.Height() );
 
     uno::Sequence< beans::PropertyValue > aRenderer(1);
@@ -978,7 +954,7 @@ void SAL_CALL SmModel::render(
                 // no real printer ??
                 if (aPrtPaperSize.Height() == 0 || aPrtPaperSize.Width() == 0)
                 {
-                    aPrtPaperSize = lcl_GuessPaperSize();
+                    aPrtPaperSize = SvxPaperInfo::GetDefaultPaperSize(MAP_100TH_MM);
                     // factors from Windows DIN A4
                     aOutputSize    = Size( (long)(aPrtPaperSize.Width()  * 0.941),
                                            (long)(aPrtPaperSize.Height() * 0.961));