[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc

[Caolán McNamara]

 binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx |   28 +++++++++++++-------------
 binfilter/inc/bf_sw/swtypes.hxx               |    2 +
 2 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit ebe4d7690bafd873604dbca8a05136d9ab71cc0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 4 13:18:23 2011 +0000

    throw out some warnings

diff --git a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
index 51c4b40..60eedd9 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unotxdoc.cxx
@@ -2229,22 +2229,22 @@ Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames(void)
 
 
 SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(
-            Reference< XNameAccess >  xAccess, const String& rLinkDisplayName, String sSuffix ) :
-    aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_LINK_TARGET)),
-    sLinkDisplayName(rLinkDisplayName),
-    xRealAccess(xAccess),
-    sLinkSuffix(sSuffix),
-    pxDoc(0)
+            Reference< XNameAccess >  xAccess, const String& rLinkDisplayName, String sSuffix )
+    : xRealAccess(xAccess)
+    , aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_LINK_TARGET))
+    , sLinkSuffix(sSuffix)
+    , sLinkDisplayName(rLinkDisplayName)
+    , pxDoc(0)
 {
 }
 
 SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc,
-            const String& rLinkDisplayName, String sSuffix) :
-    sLinkSuffix(sSuffix),
-    sLinkDisplayName(rLinkDisplayName),
-    aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_LINK_TARGET)),
-    pxDoc(&rxDoc),
-    xDoc(&rxDoc)
+            const String& rLinkDisplayName, String sSuffix)
+    : aPropSet(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_LINK_TARGET))
+    , sLinkSuffix(sSuffix)
+    , sLinkDisplayName(rLinkDisplayName)
+    , xDoc(&rxDoc)
+    , pxDoc(&rxDoc)
 {
 }
 
@@ -2589,8 +2589,8 @@ Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames(void) throw( Run
 }
 
 SwXDocumentPropertyHelper::SwXDocumentPropertyHelper(SwDoc& rDoc)
-: m_pDoc(&rDoc)
-, SvxUnoForbiddenCharsTable ( rDoc.GetForbiddenCharacterTbl() )
+    : SvxUnoForbiddenCharsTable ( rDoc.GetForbiddenCharacterTbl() )
+    , m_pDoc(&rDoc)
 {
 }
 
diff --git a/binfilter/inc/bf_sw/swtypes.hxx b/binfilter/inc/bf_sw/swtypes.hxx
index 49609bc..bde5805 100644
--- a/binfilter/inc/bf_sw/swtypes.hxx
+++ b/binfilter/inc/bf_sw/swtypes.hxx
@@ -222,6 +222,8 @@ enum SetAttrMode
 
 #define TWIP_TO_MM100(TWIP) 	((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
 #define MM100_TO_TWIP(MM100)	((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
+#define TWIP_TO_MM100_UNSIGNED(TWIP)     ((((TWIP)*127L+36L)/72L))
+#define MM100_TO_TWIP_UNSIGNED(MM100)    ((((MM100)*72L+63L)/127L))
 
 #define SW_ISPRINTABLE( c ) ( c >= ' ' && 127 != c )