summaryrefslogtreecommitdiff
path: root/sw/inc/unomod.hxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-01-06 16:42:28 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-01-06 16:42:28 +0000
commit25913c730f07766457d08f24008cbfb97f0a60a3 (patch)
treeacdcd858cd19f68597bdc872a4355dd3c335e7b1 /sw/inc/unomod.hxx
parent05342c68cbfedb1cc4f9832592fa277d30832162 (diff)
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
Diffstat (limited to 'sw/inc/unomod.hxx')
-rw-r--r--sw/inc/unomod.hxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx
index 0a6507e08a18..dcb2f9cfcbda 100644
--- a/sw/inc/unomod.hxx
+++ b/sw/inc/unomod.hxx
@@ -41,6 +41,7 @@
#include <cppuhelper/implbase4.hxx> // helper for implementations
#include <comphelper/ChainablePropertySet.hxx>
#include <comphelper/SettingsHelper.hxx>
+#include <usrpref.hxx>
class SwView;
class SwViewOption;
@@ -146,6 +147,12 @@ protected:
SwViewOption* mpViewOption;
const SwViewOption* mpConstViewOption;
sal_Bool bObjectValid:1, bWeb:1, mbApplyZoom;
+
+ sal_Int32 eHRulerUnit;
+ sal_Bool mbApplyHRulerMetric;
+ sal_Int32 eVRulerUnit;
+ sal_Bool mbApplyVRulerMetric;
+
virtual void _preSetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException );
virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue )