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

5 files changed, 21 insertions, 66 deletions

diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index f137f69ce086..43d805b162ac 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -36,7 +36,6 @@
 #include <ooxml/resourceids.hxx>
 #include <tools/color.hxx>
 #include <rtl/ustrbuf.hxx>
-#   include <svx/paperinf.hxx>      //lA0Width...
 #include <algorithm>
 #include <functional>
 
@@ -485,56 +484,6 @@ sal_Int32 ConvertColor(sal_Int32 nWordColor)
     sal_Int32 nRet = (t<<24) + (r<<16) + (g<<8) + b;
     return nRet;
 }
-/*-- 12.12.2006 08:59:42---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
-class closeenough : public std::unary_function<long, bool>
-{
-private:
-    long mnValue;
-    long mnWriggleRoom;
-public:
-    closeenough(long nValue, long nWriggleRoom)
-        : mnValue(nValue), mnWriggleRoom(nWriggleRoom) {}
-    bool operator()(long nTest) const
-    {
-        return (
-                (mnValue - nTest < mnWriggleRoom) &&
-                (mnValue - nTest > -mnWriggleRoom)
-               );
-    }
-};
-/*-- 12.12.2006 08:59:42---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
-sal_Int32 SnapPageDimension( sal_Int32 nVal )
-{
-    static const long aSizes[] =
-    {
-        lA0Width, lA0Height, lA1Width, lA2Width, lA3Width, lA4Width,
-        lA5Width, lB4Width, lB4Height, lB5Width, lB6Width, lC4Width,
-        lC4Height, lC5Width, lC6Width, lC65Width, lC65Height, lDLWidth,
-        lDLHeight, lJISB4Width, lJISB4Height, lJISB5Width, lJISB6Width,
-        lLetterWidth, lLetterHeight, lLegalHeight, lTabloidWidth,
-        lTabloidHeight, lDiaWidth, lDiaHeight, lScreenWidth,
-        lScreenHeight, lAWidth, lAHeight, lBHeight, lCHeight, lDHeight,
-        lEHeight, lExeWidth, lExeHeight, lLegal2Width, lLegal2Height,
-        lCom675Width, lCom675Height, lCom9Width, lCom9Height,
-        lCom10Width, lCom10Height, lCom11Width, lCom11Height,
-        lCom12Width, lMonarchHeight, lKai16Width, lKai16Height,
-        lKai32Width, lKai32BigWidth, lKai32BigHeight
-    };
-
-    const long nWriggleRoom = 5;
-    const long *pEnd = aSizes + sizeof(aSizes) / sizeof(aSizes[0]);
-    const long *pEntry =
-        std::find_if(aSizes, pEnd, closeenough(nVal, nWriggleRoom));
-
-    if (pEntry != pEnd)
-        nVal = *pEntry;
-
-    return nVal;
-}
 /*-- 27.06.2007 13:42:32---------------------------------------------------
 
   -----------------------------------------------------------------------*/
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx b/writerfilter/source/dmapper/ConversionHelper.hxx
index 3c85c5681fae..3cb27ef89d99 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -57,7 +57,6 @@ namespace ConversionHelper{
     // probably the most useless unit in the world - English Metric Units (EMU) 360 000 EMU == 1cm
     sal_Int32 convertEMUToMM100(sal_Int32 _t);
     sal_Int32 ConvertColor(sal_Int32 nWordColor );
-    sal_Int32 SnapPageDimension( sal_Int32 nVal );
     sal_Int16 convertTableJustification( sal_Int32 nIntValue );
     ::com::sun::star::util::DateTime convertDateTime( const ::rtl::OUString& rDateTimeString );
     sal_Int16 ConvertNumberingType(sal_Int32 nNFC);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index b806706ef12a..d61cf5024b99 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -36,6 +36,7 @@
 #include <MeasureHandler.hxx>
 #include <OLEHandler.hxx>
 #include <i18npool/mslangid.hxx>
+#include <i18npool/paper.hxx>
 #include <ooxml/OOXMLFastTokens.hxx>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
@@ -1816,8 +1817,8 @@ void DomainMapper::attribute(Id nName, Value & val)
         case NS_ooxml::LN_CT_PageSz_h:
             /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             {
-                sal_Int32 nHeight = ConversionHelper::SnapPageDimension(nIntValue);
-                CT_PageSz.h = ConversionHelper::convertTwipToMM100(nHeight);
+                sal_Int32 nHeight = ConversionHelper::convertTwipToMM100(nIntValue);
+                CT_PageSz.h = PaperInfo::sloppyFitPageDimension(nHeight);
             }
             break;
         case NS_ooxml::LN_CT_PageSz_orient:
@@ -1827,8 +1828,8 @@ void DomainMapper::attribute(Id nName, Value & val)
         case NS_ooxml::LN_CT_PageSz_w:
             /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             {
-                sal_Int32 nWidth = ConversionHelper::SnapPageDimension(nIntValue);
-                CT_PageSz.w = ConversionHelper::convertTwipToMM100(nWidth);
+                sal_Int32 nWidth = ConversionHelper::convertTwipToMM100(nIntValue);
+                CT_PageSz.w = PaperInfo::sloppyFitPageDimension(nWidth);
             }
             break;
 
@@ -3346,16 +3347,16 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp
     {
         /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
         //page height, rounded to default values, default: 0x3dc0 twip
-        sal_Int32 nHeight = ConversionHelper::SnapPageDimension( nIntValue );
-        rContext->Insert( PROP_HEIGHT, false, uno::makeAny( ConversionHelper::convertTwipToMM100( nHeight ) ) );
+        sal_Int32 nHeight = ConversionHelper::convertTwipToMM100( nIntValue );
+        rContext->Insert( PROP_HEIGHT, false, uno::makeAny( PaperInfo::sloppyFitPageDimension( nHeight ) ) );
     }
     break;
     case NS_sprm::LN_SXaPage:   // sprmSXaPage
     {
         /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
         //page width, rounded to default values, default 0x2fd0 twip
-        sal_Int32 nWidth = ConversionHelper::SnapPageDimension( nIntValue );
-        rContext->Insert( PROP_WIDTH, false, uno::makeAny( ConversionHelper::convertTwipToMM100( nWidth ) ) );
+        sal_Int32 nWidth = ConversionHelper::convertTwipToMM100( nIntValue );
+        rContext->Insert( PROP_WIDTH, false, uno::makeAny( PaperInfo::sloppyFitPageDimension( nWidth ) ) );
     }
     break;
     case 166:
@@ -3801,8 +3802,11 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp
     case NS_ooxml::LN_EG_SectPrContents_pgSz:
         /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
         CT_PageSz.code = 0;
-        CT_PageSz.h = ConversionHelper::convertTwipToMM100( ConversionHelper::SnapPageDimension( sal_Int32(15840) ));
-        CT_PageSz.w = ConversionHelper::convertTwipToMM100( ConversionHelper::SnapPageDimension( sal_Int32(12240) ));
+        {
+            PaperInfo aLetter(PAPER_LETTER);
+            CT_PageSz.w = aLetter.getWidth();
+            CT_PageSz.h = aLetter.getHeight();
+        }
         CT_PageSz.orient = false;
         resolveSprmProps(rSprm);
         OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 074785052dc5..f39338eca908 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -32,6 +32,7 @@
 #include <ooxml/resourceids.hxx>
 #include <DomainMapper_Impl.hxx>
 #include <ConversionHelper.hxx>
+#include <i18npool/paper.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/table/BorderLine.hpp>
@@ -209,10 +210,11 @@ SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) :
         m_nBorderDistances[ nBorder ] = -1;
     //todo: set defaults in ApplyPropertiesToPageStyles
     //initialize defaults
-    //page height, todo: rounded to default values, default: 0x3dc0 (15808) twip  27883 1/100 mm
-    Insert( PROP_HEIGHT, false, uno::makeAny( (sal_Int32) 27883 ) );
-    //page width, todo: rounded to default values, default 0x2fd0 (12240) twip -> 21590 1/100 mm
-    Insert( PROP_WIDTH, false, uno::makeAny( (sal_Int32)21590 ) );
+    PaperInfo aLetter(PAPER_LETTER);
+    //page height, 1/100mm
+    Insert( PROP_HEIGHT, false, uno::makeAny( (sal_Int32) aLetter.getHeight() ) );
+    //page width, 1/100mm
+    Insert( PROP_WIDTH, false, uno::makeAny( (sal_Int32) aLetter.getWidth() ) );
     //page left margin, default 0x708 (1800) twip -> 3175 1/100 mm
     Insert( PROP_LEFT_MARGIN, false, uno::makeAny( (sal_Int32) 3175 ) );
     //page right margin, default 0x708 (1800) twip -> 3175 1/100 mm
diff --git a/writerfilter/util/makefile.mk b/writerfilter/util/makefile.mk
index a210a9d0bc2a..08033ab9c8df 100644
--- a/writerfilter/util/makefile.mk
+++ b/writerfilter/util/makefile.mk
@@ -56,6 +56,7 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1STDLIBS=\
     $(I18NISOLANGLIB) \
+    $(I18NPAPERLIB) \
     $(SOTLIB) \
     $(TOOLSLIB) \
     $(UNOTOOLSLIB) \