[ooo-build-commit] Branch 'ooo/master' - reportdesign/images reportdesign/source

[Jan Holesovsky]

 reportdesign/images/em42.png                       |binary
 reportdesign/images/em42_hc.png                    |binary
 reportdesign/source/core/api/ReportDefinition.cxx  |    2 +-
 reportdesign/source/ui/report/ReportController.cxx |    4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e352aab3c5dc930f96754b5c9c00842665ae1652
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Fri Jun 12 09:36:34 2009 +0000

    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 at 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 at 271427 (milestone: DEV300:m47)
    2009-04-06 15:33:37 +0200 cmc  r270556 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 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 at 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 at 268395 (milestone: DEV300:m42)
    2009-03-09 12:11:29 +0100 cmc  r269077 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 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 at 264807 (milestone: DEV300:m37)
    2008-11-26 10:33:06 +0100 cmc  r264357 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 264325 (milestone: DEV300:m36)
    2008-11-21 14:09:36 +0100 cmc  r264138 : #i92819# paper consolidation

diff --git a/reportdesign/images/em42.png b/reportdesign/images/em42.png
new file mode 100644
index 0000000..31f48ea
Binary files /dev/null and b/reportdesign/images/em42.png differ
diff --git a/reportdesign/images/em42_hc.png b/reportdesign/images/em42_hc.png
new file mode 100644
index 0000000..3870cc4
Binary files /dev/null and b/reportdesign/images/em42_hc.png differ
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 01394d2..fcf7707 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -295,7 +295,7 @@ OStyle::OStyle()
 :OStyle_PBASE(m_aBHelper)
 ,m_aSize(21000,29700)
 {
-    const ::Size aDefaultSize = SvxPaperInfo::GetPaperSize(SvxPaperInfo::GetDefaultSvxPaper(Application::GetSettings().GetLanguage()),MAP_100TH_MM);
+    const ::Size aDefaultSize = SvxPaperInfo::GetDefaultPaperSize( MAP_100TH_MM );
     m_aSize.Height = aDefaultSize.Height();
     m_aSize.Width = aDefaultSize.Width();
 
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index aba7159..60c3e24 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2429,8 +2429,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
         new SvxPageItem(RPTUI_ID_PAGE),
         new SvxSizeItem(RPTUI_ID_SIZE),
         new SfxAllEnumItem(RPTUI_ID_PAGE_MODE,SVX_PAGE_MODE_STANDARD),
-        new SfxAllEnumItem(RPTUI_ID_START,SVX_PAPER_A4),
-        new SfxAllEnumItem(RPTUI_ID_END,SVX_PAPER_E),
+        new SfxAllEnumItem(RPTUI_ID_START,PAPER_A4),
+        new SfxAllEnumItem(RPTUI_ID_END,PAPER_E),
         new SvxBrushItem(ITEMID_BRUSH),
         new SfxUInt16Item(RPTUI_ID_METRIC,static_cast<UINT16>(eUserMetric))
     };