You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/02/26 10:26:14 UTC

[openoffice] branch AOO42X updated: Using vim modeline, cleanup

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 0cd1d3bc03 Using vim modeline, cleanup
0cd1d3bc03 is described below

commit 0cd1d3bc037f5a786106de8ee49650b4f01d26ae
Author: mseidel <ms...@apache.org>
AuthorDate: Sun Feb 26 11:22:10 2023 +0100

    Using vim modeline, cleanup
    
    (cherry picked from commit 8c733e3e3dc39b4d0997cd00d76f346f7fdf5138)
---
 main/filter/source/msfilter/dffrecordheader.cxx |  15 ++--
 main/filter/source/msfilter/msvbasic.hxx        |  96 +++++++++++----------
 main/sal/rtl/source/debugprint.cxx              |  24 +++---
 main/sw/source/filter/ww8/needed_cast.hxx       |  62 +++++++-------
 main/sw/source/filter/ww8/staticassert.hxx      |  58 ++++++-------
 main/sw/source/filter/ww8/tracer.hxx            | 107 ++++++++++++------------
 main/sw/source/filter/ww8/types.hxx             |  34 ++++----
 main/sw/source/filter/ww8/typessw.hxx           |  25 +++---
 8 files changed, 207 insertions(+), 214 deletions(-)

diff --git a/main/filter/source/msfilter/dffrecordheader.cxx b/main/filter/source/msfilter/dffrecordheader.cxx
index 9c547a16ed..02c292f298 100644
--- a/main/filter/source/msfilter/dffrecordheader.cxx
+++ b/main/filter/source/msfilter/dffrecordheader.cxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,23 +7,22 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
 #include "precompiled_filter.hxx"
-
-#include <filter/msfilter/dffrecordheader.hxx> 
+#include <filter/msfilter/dffrecordheader.hxx>
 
 SvStream& operator>>( SvStream& rIn, DffRecordHeader& rRec )
 {
@@ -36,8 +35,8 @@ SvStream& operator>>( SvStream& rIn, DffRecordHeader& rRec )
 	rIn >> rRec.nRecType;
 	rIn >> rRec.nRecLen;
 	if ( rRec.nRecLen > ( SAL_MAX_UINT32 - rRec.nFilePos ) )	// preserving overflow, optimal would be to check
-		rIn.SetError( SVSTREAM_FILEFORMAT_ERROR );				// the record size against the parent header    
+		rIn.SetError( SVSTREAM_FILEFORMAT_ERROR );				// the record size against the parent header
 	return rIn;
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/filter/source/msfilter/msvbasic.hxx b/main/filter/source/msfilter/msvbasic.hxx
index ae2a7f9432..b938d21dbb 100644
--- a/main/filter/source/msfilter/msvbasic.hxx
+++ b/main/filter/source/msfilter/msvbasic.hxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,22 +7,20 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
 #ifndef _MSVBASIC_HXX
 #define _MSVBASIC_HXX
 
@@ -60,57 +58,57 @@ DECLARE_DYNARRAY(StringArray,String *)
 //
 typedef sal_Int32 ModType;
 typedef ::std::map< UniString,
-    ModType > ModuleTypeHash;
+	ModType > ModuleTypeHash;
 
 class VBA_Impl
 {
 public:
-    VBA_Impl(SvStorage &rIn, bool bCmmntd = true);
-    ~VBA_Impl();
-    //0 for failure, 1 for success
-    bool Open( const String &rToplevel, const String &rSublevel);
-    const StringArray & Decompress(sal_uInt16 nIndex, int *pOverflow=0);
-    sal_uInt16 GetNoStreams() const { return nOffsets; }
-    const String &GetStreamName(sal_uInt16 nIndex) const
-    {
-        DBG_ASSERT( nIndex < nOffsets, "Index out of range" );
-        return pOffsets[ nIndex ].sName;
-    }
-    //I'm the method that would be made virtual to make this class
-    //useful elsewhere
-    void Output(int len, const sal_uInt8 *data);
-    //
-    // #117718# member map of module names to types of module
-    ModType GetModuleType( const UniString& rModuleName );
-    std::vector<String> maReferences;
+	VBA_Impl(SvStorage &rIn, bool bCmmntd = true);
+	~VBA_Impl();
+	// 0 for failure, 1 for success
+	bool Open( const String &rToplevel, const String &rSublevel);
+	const StringArray & Decompress(sal_uInt16 nIndex, int *pOverflow=0);
+	sal_uInt16 GetNoStreams() const { return nOffsets; }
+	const String &GetStreamName(sal_uInt16 nIndex) const
+	{
+		DBG_ASSERT( nIndex < nOffsets, "Index out of range" );
+		return pOffsets[ nIndex ].sName;
+	}
+	// I'm the method that would be made virtual to make this class
+	// useful elsewhere
+	void Output(int len, const sal_uInt8 *data);
+	//
+	// #117718# member map of module names to types of module
+	ModType GetModuleType( const UniString& rModuleName );
+	std::vector<String> maReferences;
 private:
-    struct VBAOffset_Impl
-    {
-        String sName;
-        sal_uInt32 nOffset;
-    };
+	struct VBAOffset_Impl
+	{
+		String sName;
+		sal_uInt32 nOffset;
+	};
 
-    // #117718# member map of module names to types of module
-    ModuleTypeHash mhModHash;
-    SvStorageRef xVBA;
-    StringArray aVBAStrings;
-    String sComment;
-    SvStorageRef xStor;
-    VBAOffset_Impl *pOffsets;
-    sal_uInt16 nOffsets;
-    enum Limits {nWINDOWLEN = 4096};
-    sal_uInt8 aHistory[nWINDOWLEN];
-    rtl_TextEncoding meCharSet;
-    bool bCommented;
-    bool mbMac;
-    int nLines;
+	// #117718# member map of module names to types of module
+	ModuleTypeHash mhModHash;
+	SvStorageRef xVBA;
+	StringArray aVBAStrings;
+	String sComment;
+	SvStorageRef xStor;
+	VBAOffset_Impl *pOffsets;
+	sal_uInt16 nOffsets;
+	enum Limits {nWINDOWLEN = 4096};
+	sal_uInt8 aHistory[nWINDOWLEN];
+	rtl_TextEncoding meCharSet;
+	bool bCommented;
+	bool mbMac;
+	int nLines;
 
-    //0 for failure, anything else for success
-    int ReadVBAProject(const SvStorageRef &rxVBAStorage);
-    int DecompressVBA(int index, SvStorageStreamRef &rxVBAStream);
-    sal_uInt8 ReadPString(SvStorageStreamRef &xVBAProject, bool bIsUnicode);
+	// 0 for failure, anything else for success
+	int ReadVBAProject(const SvStorageRef &rxVBAStorage);
+	int DecompressVBA(int index, SvStorageStreamRef &rxVBAStream);
+	sal_uInt8 ReadPString(SvStorageStreamRef &xVBAProject, bool bIsUnicode);
 };
 
 #endif
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sal/rtl/source/debugprint.cxx b/main/sal/rtl/source/debugprint.cxx
index 0a4e1b859a..757586b957 100644
--- a/main/sal/rtl/source/debugprint.cxx
+++ b/main/sal/rtl/source/debugprint.cxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -29,26 +29,26 @@
 
 const sal_Char *dbg_dump(const rtl::OString &rStr)
 {
-    static rtl::OStringBuffer aStr;
+	static rtl::OStringBuffer aStr;
 
-    aStr = rtl::OStringBuffer(rStr);
-    aStr.append(static_cast<char>(0));
-    return aStr.getStr();
+	aStr = rtl::OStringBuffer(rStr);
+	aStr.append(static_cast<char>(0));
+	return aStr.getStr();
 }
 
 const sal_Char *dbg_dump(const rtl::OUString &rStr)
 {
-    return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
+	return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
 }
 
 const sal_Char *dbg_dump(rtl_String *pStr)
 {
-    return dbg_dump(rtl::OString(pStr));
+	return dbg_dump(rtl::OString(pStr));
 }
 
 const sal_Char *dbg_dump(rtl_uString *pStr)
 {
-    return dbg_dump(rtl::OUString(pStr));
+	return dbg_dump(rtl::OUString(pStr));
 }
 
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/filter/ww8/needed_cast.hxx b/main/sw/source/filter/ww8/needed_cast.hxx
index c68c7c820e..cc3dc1125c 100644
--- a/main/sw/source/filter/ww8/needed_cast.hxx
+++ b/main/sw/source/filter/ww8/needed_cast.hxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,53 +7,53 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #ifndef WW_NEEDED_CAST_HXX
 #define WW_NEEDED_CAST_HXX
 
 #include <tools/debug.hxx>
-#   include "staticassert.hxx"
+#include "staticassert.hxx"
 
 namespace ww
 {
-    template<typename Ret, typename Param> Ret checking_cast(Param in, Ret)
-    {
-        return static_cast<Ret>(in);
-    }
-
-    template<typename Ret> Ret checking_cast(Ret in, Ret)
-    {
-        DBG_ASSERT( false, "UnnecessaryCast" );
-        return in;
-    }
-
-    /*
-     needed_cast is the same as static_cast except that there will be a compile
-     time assert when NDEBUG is not defined and the in and out types are the
-     same.  i.e. needed_cast catches unnecessary casts
-    */
-    template<typename Ret, typename Param> Ret needed_cast(Param in)
-    {
-        /*
-         Massage a single argument and a ret value into two arguments to allow 
-         a determination if the dest type is the same as the sourct type
-        */
-        return checking_cast(in, Ret());
-    }
+	template<typename Ret, typename Param> Ret checking_cast(Param in, Ret)
+	{
+		return static_cast<Ret>(in);
+	}
+
+	template<typename Ret> Ret checking_cast(Ret in, Ret)
+	{
+		DBG_ASSERT( false, "UnnecessaryCast" );
+		return in;
+	}
+
+	/*
+	needed_cast is the same as static_cast except that there will be a compile
+	time assert when NDEBUG is not defined and the in and out types are the
+	same. i.e. needed_cast catches unnecessary casts
+	*/
+	template<typename Ret, typename Param> Ret needed_cast(Param in)
+	{
+		/*
+		Massage a single argument and a ret value into two arguments to allow
+		a determination if the dest type is the same as the source type
+		*/
+		return checking_cast(in, Ret());
+	}
 }
 #endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/filter/ww8/staticassert.hxx b/main/sw/source/filter/ww8/staticassert.hxx
index afc20e44b6..9a5a4be408 100644
--- a/main/sw/source/filter/ww8/staticassert.hxx
+++ b/main/sw/source/filter/ww8/staticassert.hxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,21 +7,20 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #ifndef WW_STATICASSERT_HXX
 #define WW_STATICASSERT_HXX
 
@@ -33,35 +32,36 @@
 */
 namespace ww
 {
-    template<bool> class compile_time_check
-    {
-    public:
-        compile_time_check(...) {}
-    };
+	template<bool> class compile_time_check
+	{
+	public:
+		compile_time_check(...) {}
+	};
 
-    template<> class compile_time_check<false>
-    {
-    };
+	template<> class compile_time_check<false>
+	{
+	};
 }
 
-    /*
-    Similar to assert, StaticAssert is only in operation when NDEBUG is not
-    defined. It will test its first argument at compile time and on failure
-    report the error message of the second argument, which must be a valid c++
-    classname. i.e. no spaces, punctuation or reserved keywords.
-    */
+	/*
+	Similar to assert, StaticAssert is only in operation when NDEBUG is not
+	defined. It will test its first argument at compile time and on failure
+	report the error message of the second argument, which must be a valid c++
+	classname. i.e. no spaces, punctuation or reserved keywords.
+	*/
 #ifndef NDEBUG
-#   define StaticAssert(test, errormsg)                         \
-    do {                                                        \
-        struct ERROR_##errormsg {};                             \
-        typedef ww::compile_time_check< (test) != 0 > tmplimpl; \
-        tmplimpl aTemp = tmplimpl(ERROR_##errormsg());          \
-        sizeof(aTemp);                                          \
-    } while (0)
+#	define StaticAssert(test, errormsg)							\
+	do {														\
+		struct ERROR_##errormsg {};								\
+		typedef ww::compile_time_check< (test) != 0 > tmplimpl; \
+		tmplimpl aTemp = tmplimpl(ERROR_##errormsg());			\
+		sizeof(aTemp);											\
+	} while (0)
 #else
-#   define StaticAssert(test, errormsg)                         \
-    do {} while (0)
+#	define StaticAssert(test, errormsg)							\
+	do {} while (0)
 #endif
 
 #endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/filter/ww8/tracer.hxx b/main/sw/source/filter/ww8/tracer.hxx
index 60bbf1b27f..3c9f43516d 100644
--- a/main/sw/source/filter/ww8/tracer.hxx
+++ b/main/sw/source/filter/ww8/tracer.hxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,81 +7,80 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
 #ifndef SW_TRACER_HXX
 #define SW_TRACER_HXX
 
-#include <rtl/ustring.hxx>      //rtl::OUString
+#include <rtl/ustring.hxx> //rtl::OUString
 
 class MSFilterTracer;
 class SfxMedium;
 
 namespace sw
 {
-    namespace log
-    {
+	namespace log
+	{
 
-        enum Problem
-        {
-            ePrinterMetrics = 1,
-            eExtraLeading,
-            eTabStopDistance,
-            eDontUseHTMLAutoSpacing,
-            eAutoWidthFrame,
-            eRowCanSplit,
-            eSpacingBetweenCells,
-            eTabInNumbering,
-            eNegativeVertPlacement,
-            eAutoColorBg,
-            eTooWideAsChar,
-            eAnimatedText,
-            eDontAddSpaceForEqualStyles,
-            eBorderDistOutside,
-            eContainsVisualBasic,
-            eContainsWordBasic
-        };
+		enum Problem
+		{
+			ePrinterMetrics = 1,
+			eExtraLeading,
+			eTabStopDistance,
+			eDontUseHTMLAutoSpacing,
+			eAutoWidthFrame,
+			eRowCanSplit,
+			eSpacingBetweenCells,
+			eTabInNumbering,
+			eNegativeVertPlacement,
+			eAutoColorBg,
+			eTooWideAsChar,
+			eAnimatedText,
+			eDontAddSpaceForEqualStyles,
+			eBorderDistOutside,
+			eContainsVisualBasic,
+			eContainsWordBasic
+		};
 
-        enum Environment
-        {
-            eDocumentProperties,
-            eMacros,
-            eMainText,
-            eSubDoc,
-            eTable
-        };
+		enum Environment
+		{
+			eDocumentProperties,
+			eMacros,
+			eMainText,
+			eSubDoc,
+			eTable
+		};
 
-        class Tracer
-        {
-        private:
-            MSFilterTracer *mpTrace;
-            rtl::OUString GetContext(Environment eContext) const;
-            rtl::OUString GetDetails(Environment eContext) const;
-        public:
-            Tracer(const SfxMedium &rMedium);
-            MSFilterTracer *GetTrace() const { return mpTrace; }
-            void EnterEnvironment(Environment eContext);
-            void EnterEnvironment(Environment eContext, 
-                const rtl::OUString &rDetails);
-            void Log(Problem eProblem);
-            void LeaveEnvironment(Environment eContext);
-            ~Tracer();
-        };
-    }
+		class Tracer
+		{
+		private:
+			MSFilterTracer *mpTrace;
+			rtl::OUString GetContext(Environment eContext) const;
+			rtl::OUString GetDetails(Environment eContext) const;
+		public:
+			Tracer(const SfxMedium &rMedium);
+			MSFilterTracer *GetTrace() const { return mpTrace; }
+			void EnterEnvironment(Environment eContext);
+			void EnterEnvironment(Environment eContext,
+				const rtl::OUString &rDetails);
+			void Log(Problem eProblem);
+			void LeaveEnvironment(Environment eContext);
+			~Tracer();
+		};
+	}
 }
 #endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/filter/ww8/types.hxx b/main/sw/source/filter/ww8/types.hxx
index 1fde36cbaf..72b32ef68e 100644
--- a/main/sw/source/filter/ww8/types.hxx
+++ b/main/sw/source/filter/ww8/types.hxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,22 +7,20 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
 #ifndef WW_TYPES
 #define WW_TYPES
 
@@ -36,19 +34,19 @@
 
 namespace ww
 {
-    typedef std::vector<sal_uInt8> bytes;
-
-    enum WordVersion {eWW2 = 2, eWW6 = 6, eWW7 = 7, eWW8 = 8};
-    inline bool IsSevenMinus(WordVersion eVer) { return eVer <= eWW7; }
-    inline bool IsEightPlus(WordVersion eVer) { return eVer >= eWW8; }
+	typedef std::vector<sal_uInt8> bytes;
 
-    /** For custom wrapping 
+	enum WordVersion {eWW2 = 2, eWW6 = 6, eWW7 = 7, eWW8 = 8};
+	inline bool IsSevenMinus(WordVersion eVer) { return eVer <= eWW7; }
+	inline bool IsEightPlus(WordVersion eVer) { return eVer >= eWW8; }
 
-        When you edit the wrap points of a contour in word, word uses a relative
-        scale of 0 to 21600 where 21600 is apparently 100% of the graphic width
-    */
-    const int nWrap100Percent = 21600;
+	/** For custom wrapping
+	When you edit the wrap points of a contour in Word, it uses a relative
+	scale of 0 to 21600 where 21600 is apparently 100% of the graphic width
+	*/
+	const int nWrap100Percent = 21600;
 }
- 
+
 #endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/filter/ww8/typessw.hxx b/main/sw/source/filter/ww8/typessw.hxx
index 62a6defb98..0cbfca5e7b 100644
--- a/main/sw/source/filter/ww8/typessw.hxx
+++ b/main/sw/source/filter/ww8/typessw.hxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,22 +7,20 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
 #ifndef WW_TYPESSW
 #define WW_TYPESSW
 
@@ -30,13 +28,14 @@
 
 namespace ww
 {
-    typedef sal_Int8 sal_Int8;
-    typedef sal_Int16 sal_Int16;
-    typedef sal_Int32 sal_Int32;
-    typedef sal_uInt8 sal_uInt8;
-    typedef sal_uInt16 sal_uInt16;
-    typedef sal_uInt32 sal_uInt32;
+	typedef sal_Int8 sal_Int8;
+	typedef sal_Int16 sal_Int16;
+	typedef sal_Int32 sal_Int32;
+	typedef sal_uInt8 sal_uInt8;
+	typedef sal_uInt16 sal_uInt16;
+	typedef sal_uInt32 sal_uInt32;
 }
 
 #endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
+
+/* vim: set noet sw=4 ts=4: */