CWS-TOOLING: integrate CWS os123

2008-12-10 10:15:09 +0100 os  r265154 : #i94987# DateTimeValue added
2008-12-10 09:00:58 +0100 os  r265150 : #i96045# ctl languages enabled
2008-12-09 18:09:10 +0100 os  r265129 : syntax error fixed
2008-12-09 09:35:09 +0100 os  r265056 : vertical/horizonatal metric: no bool value
2008-12-08 09:56:50 +0100 os  r264974 : CWS-TOOLING: rebase CWS os123 to trunk@264807 (milestone: DEV300:m37)
2008-12-03 11:41:13 +0100 os  r264762 : #i96822# database removed, too
2008-12-03 11:35:26 +0100 os  r264760 : #i96822# business cards and labels should not be part of the document list
2008-12-01 11:38:26 +0100 os  r264592 : #i96322# command name of ActivateStyleApply added
2008-11-27 14:59:46 +0100 va  r264491 : #i95322#: Initial Revision
2008-11-27 14:53:20 +0100 va  r264490 : #i95322#: New Language Directory for Persian (Farsi)
2008-11-21 08:48:55 +0100 os  r264107 : #i94409# recording/executing split table
2008-11-13 13:18:57 +0100 os  r263636 : #i93924# string reconversion
2008-11-12 15:58:48 +0100 os  r263604 : #i94987# Date property re-add to Annotation service
2008-11-12 15:44:24 +0100 os  r263603 : #i88766# ruler metric
2008-11-12 15:43:33 +0100 os  r263602 : #i88766#
2008-11-11 09:15:28 +0100 os  r263545 : #i94839# get real filter name from dialog instead of guessing from UI name

1 files changed, 36 insertions, 16 deletions

diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 1ab26f988261..8a63254f42c1 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -53,35 +53,19 @@
 #include <swmodule.hxx>
 #include <swtypes.hxx>
 #include <usrpref.hxx>
-#ifndef _MODCFG_HXX
 #include <modcfg.hxx>
-#endif
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
-#ifndef _PVIEW_HXX
 #include <pview.hxx>
-#endif
-#ifndef _WVIEW_HXX
 #include <wview.hxx>
-#endif
 #include <wrtsh.hxx>
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
 #include <uinums.hxx>
 #include <prtopt.hxx>       // fuer PrintOptions
 #include <navicfg.hxx>
 #include <doc.hxx>
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
-#ifndef _APP_HRC
 #include <app.hrc>
-#endif
 #include "helpid.h"
 
 #include <unomid.h>
@@ -289,7 +273,43 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric, BOOL bWeb )
 
             pTmpView = SwModule::GetNextView(pTmpView);
         }
+}
+/*-- 12.11.2008 14:47:58---------------------------------------------------
 
+  -----------------------------------------------------------------------*/
+void SwModule::ApplyRulerMetric( FieldUnit eMetric, BOOL bHorizontal, BOOL bWeb )
+{
+    SwMasterUsrPref* pPref;
+    if(bWeb)
+    {
+        if(!pWebUsrPref)
+            GetUsrPref(sal_True);
+        pPref = pWebUsrPref;
+    }
+    else
+    {
+        if(!pUsrPref)
+            GetUsrPref(sal_False);
+        pPref = pUsrPref;
+    }
+    if( bHorizontal )
+        pPref->SetHScrollMetric(eMetric);
+    else
+        pPref->SetVScrollMetric(eMetric);
+
+    SwView* pTmpView = SwModule::GetFirstView();
+    // switch metric at the appropriate rulers
+    while(pTmpView)
+    {
+        if(bWeb == (0 != dynamic_cast<SwWebView *>( pTmpView )))
+        {
+            if( bHorizontal )
+                pTmpView->ChangeTabMetric(eMetric);
+            else
+                pTmpView->ChangeVLinealMetric(eMetric);
+        }
+        pTmpView = SwModule::GetNextView(pTmpView);
+    }
 }
 /*-----------------13.11.96 11.57-------------------