[Libreoffice-commits] .: 3 commits - starmath/source sw/inc sw/sdi sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Oct 28 08:03:12 PDT 2010
starmath/source/mathmlexport.cxx | 2
starmath/source/mathmlimport.cxx | 6 -
starmath/source/mathtype.cxx | 3
starmath/source/smdetect.cxx | 12 +-
starmath/source/unomodel.cxx | 2
sw/inc/PostItMgr.hxx | 26 +---
sw/inc/cmdid.h | 3
sw/inc/error.h | 3
sw/inc/helpid.h | 3
sw/inc/swdllapi.h | 3
sw/inc/swerror.h | 2
sw/inc/swstyle.h | 2
sw/inc/unomid.h | 3
sw/sdi/swinterf.c | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/bastyp/SwSmartTagMgr.cxx | 2
sw/source/core/bastyp/breakit.cxx | 4
sw/source/core/bastyp/checkit.cxx | 2
sw/source/core/crsr/bookmrk.cxx | 8 -
sw/source/core/crsr/crossrefbookmark.cxx | 4
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/doc/doc.cxx | 14 +-
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/docnew.cxx | 6 -
sw/source/core/doc/number.cxx | 32 ++---
sw/source/core/docnode/retrieveinputstream.cxx | 2
sw/source/core/docnode/swthreadjoiner.cxx | 2
sw/source/core/edit/edfldexp.cxx | 2
sw/source/core/fields/docufld.cxx | 4
sw/source/core/fields/macrofld.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/inc/unofldmid.h | 3
sw/source/core/layout/laycache.cxx | 2
sw/source/core/ole/ndole.cxx | 4
sw/source/core/swg/SwXMLTextBlocks1.cxx | 10 -
sw/source/core/tox/toxhlp.cxx | 4
sw/source/core/unocore/swunohelper.cxx | 10 -
sw/source/core/unocore/unobkm.cxx | 4
sw/source/core/unocore/unocoll.cxx | 8 -
sw/source/core/unocore/unocrsrhelper.cxx | 6 -
sw/source/core/unocore/unofield.cxx | 8 -
sw/source/core/unocore/unoframe.cxx | 2
sw/source/core/unocore/unoidx.cxx | 18 +--
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/unocore/unoobj2.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 2
sw/source/filter/ascii/parasc.cxx | 4
sw/source/filter/basflt/iodetect.cxx | 2
sw/source/filter/html/SwAppletImpl.cxx | 14 +-
sw/source/filter/html/htmlbas.cxx | 2
sw/source/filter/html/htmlform.cxx | 148 ++++++++++++-------------
sw/source/filter/html/htmlforw.cxx | 82 ++++++-------
sw/source/filter/html/htmlplug.cxx | 38 +++---
sw/source/filter/inc/fltshell.hxx | 2
sw/source/filter/inc/msfilter.hxx | 2
sw/source/filter/inc/wwstyles.hxx | 2
sw/source/filter/rtf/rtffld.cxx | 3
sw/source/filter/rtf/rtffly.cxx | 3
sw/source/filter/rtf/rtftbl.cxx | 3
sw/source/filter/rtf/swparrtf.cxx | 3
sw/source/filter/rtf/swparrtf.hxx | 3
sw/source/filter/ww1/fltshell.cxx | 2
sw/source/filter/ww8/WW8FibData.cxx | 1
sw/source/filter/ww8/WW8FibData.hxx | 1
sw/source/filter/ww8/WW8Sttbf.cxx | 1
sw/source/filter/ww8/WW8Sttbf.hxx | 1
sw/source/filter/ww8/attributeoutputbase.hxx | 2
sw/source/filter/ww8/docxattributeoutput.hxx | 2
sw/source/filter/ww8/docxexport.cxx | 2
sw/source/filter/ww8/docxexport.hxx | 1
sw/source/filter/ww8/docxexportfilter.cxx | 6 -
sw/source/filter/ww8/docxexportfilter.hxx | 1
sw/source/filter/ww8/dump/ww8scan.cxx | 9 -
sw/source/filter/ww8/escher.hxx | 4
sw/source/filter/ww8/fields.cxx | 3
sw/source/filter/ww8/fields.hxx | 2
sw/source/filter/ww8/hash_wrap.hxx | 8 -
sw/source/filter/ww8/needed_cast.hxx | 2
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/rtfattributeoutput.hxx | 2
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/rtfexport.hxx | 1
sw/source/filter/ww8/rtfexportfilter.cxx | 2
sw/source/filter/ww8/rtfexportfilter.hxx | 1
sw/source/filter/ww8/rtfimportfilter.cxx | 2
sw/source/filter/ww8/rtfimportfilter.hxx | 1
sw/source/filter/ww8/rtfsdrexport.cxx | 2
sw/source/filter/ww8/rtfsdrexport.hxx | 1
sw/source/filter/ww8/sortedarray.hxx | 8 -
sw/source/filter/ww8/staticassert.hxx | 2
sw/source/filter/ww8/styles.cxx | 3
sw/source/filter/ww8/tracer.cxx | 3
sw/source/filter/ww8/tracer.hxx | 3
sw/source/filter/ww8/types.hxx | 3
sw/source/filter/ww8/typessw.hxx | 3
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/filter/ww8/writerhelper.hxx | 2
sw/source/filter/ww8/writerwordglue.cxx | 3
sw/source/filter/ww8/writerwordglue.hxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 3
sw/source/filter/ww8/wrtw8nds.cxx | 3
sw/source/filter/ww8/wrtw8num.cxx | 4
sw/source/filter/ww8/wrtw8sty.cxx | 4
sw/source/filter/ww8/wrtww8.cxx | 5
sw/source/filter/ww8/wrtww8.hxx | 3
sw/source/filter/ww8/wrtww8gr.cxx | 6 -
sw/source/filter/ww8/ww8atr.cxx | 3
sw/source/filter/ww8/ww8attributeoutput.hxx | 2
sw/source/filter/ww8/ww8glsy.cxx | 3
sw/source/filter/ww8/ww8glsy.hxx | 3
sw/source/filter/ww8/ww8graf.cxx | 3
sw/source/filter/ww8/ww8graf.hxx | 4
sw/source/filter/ww8/ww8graf2.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 7 -
sw/source/filter/ww8/ww8par.hxx | 3
sw/source/filter/ww8/ww8par2.cxx | 3
sw/source/filter/ww8/ww8par2.hxx | 3
sw/source/filter/ww8/ww8par3.cxx | 10 -
sw/source/filter/ww8/ww8par4.cxx | 3
sw/source/filter/ww8/ww8par5.cxx | 18 +--
sw/source/filter/ww8/ww8par6.cxx | 3
sw/source/filter/ww8/ww8scan.cxx | 4
sw/source/filter/ww8/ww8scan.hxx | 4
sw/source/filter/ww8/ww8struc.hxx | 4
sw/source/filter/xml/swxml.cxx | 16 +-
sw/source/filter/xml/wrtxml.cxx | 3
sw/source/filter/xml/xmlimp.cxx | 4
sw/source/filter/xml/xmlmeta.cxx | 4
sw/source/filter/xml/xmltexte.cxx | 38 +++---
sw/source/filter/xml/xmltexti.cxx | 34 ++---
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/app/docsh2.cxx | 16 +-
sw/source/ui/app/docst.cxx | 2
sw/source/ui/app/swmodul1.cxx | 2
sw/source/ui/app/swmodule.cxx | 6 -
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/config/caption.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/dbui/dbmgr.cxx | 6 -
sw/source/ui/dbui/mailmergechildwindow.cxx | 2
sw/source/ui/dbui/mailmergehelper.cxx | 4
sw/source/ui/dbui/mmoutputpage.cxx | 10 -
sw/source/ui/dbui/swdbtoolsclient.cxx | 6 -
sw/source/ui/dialog/swabstdlg.cxx | 2
sw/source/ui/docvw/AnnotationMenuButton.cxx | 2
sw/source/ui/docvw/AnnotationWin.cxx | 10 -
sw/source/ui/docvw/edtwin.cxx | 3
sw/source/ui/envelp/mailmrge.cxx | 6 -
sw/source/ui/inc/cfgid.h | 3
sw/source/ui/inc/globals.h | 3
sw/source/ui/inc/hidfunc.h | 3
sw/source/ui/inc/titlepage.hxx | 3
sw/source/ui/lingu/olmenu.cxx | 6 -
sw/source/ui/misc/numberingtypelistbox.cxx | 2
sw/source/ui/shells/annotsh.cxx | 6 -
sw/source/ui/shells/drawsh.cxx | 2
sw/source/ui/shells/drwtxtex.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 4
sw/source/ui/shells/frmsh.cxx | 2
sw/source/ui/shells/textsh.cxx | 24 ++--
sw/source/ui/shells/textsh1.cxx | 2
sw/source/ui/table/chartins.cxx | 4
sw/source/ui/table/tablemgr.cxx | 8 -
sw/source/ui/table/tautofmt.cxx | 2
sw/source/ui/uiview/view.cxx | 2
sw/source/ui/uiview/view2.cxx | 2
sw/source/ui/uiview/viewling.cxx | 8 -
sw/source/ui/uno/swdetect.cxx | 12 +-
sw/source/ui/uno/unotxdoc.cxx | 4
sw/source/ui/utlui/uitool.cxx | 2
sw/source/ui/vba/vbaaddins.cxx | 2
sw/source/ui/vba/vbadocumentproperties.cxx | 2
sw/source/ui/vba/vbafield.cxx | 2
sw/source/ui/vba/vbaglobals.cxx | 2
sw/source/ui/vba/vbalisthelper.cxx | 2
sw/source/ui/vba/vbaoptions.cxx | 4
sw/source/ui/vba/vbaselection.cxx | 2
sw/source/ui/vba/vbastyle.hxx | 2
sw/source/ui/vba/vbatables.cxx | 2
sw/source/ui/wrtsh/wrtsh1.cxx | 2
180 files changed, 458 insertions(+), 628 deletions(-)
New commits:
commit e2cc8e3395992267079539f412eab691a50b6c48
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 27 13:22:10 2010 +0100
add modelines to .h and .c files as well
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 2f6fbcd..e21faa4 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_starmath.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <mathtype.hxx>
#include <osl/diagnose.h>
@@ -3373,6 +3372,4 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/)
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index cd9df50..3d4eea3 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1310,3 +1311,5 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define MAC_EVENT_IMAGE_ERROR 0x0b //
#endif /* INCLUDED_SW_CMDID_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/error.h b/sw/inc/error.h
index b27d12e..7ca8f71 100644
--- a/sw/inc/error.h
+++ b/sw/inc/error.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,3 +49,5 @@
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index a021ee4..d6fc294 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -982,3 +983,5 @@
#define HID_MM_HEADER_13 (HID_BASE + 2280)
#define HID_TITLEPAGE (HID_BASE + 2281)
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swdllapi.h b/sw/inc/swdllapi.h
index f4c9e30..a17f20a 100644
--- a/sw/inc/swdllapi.h
+++ b/sw/inc/swdllapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef INCLUDED_SWDLLAPI_H
#define INCLUDED_SWDLLAPI_H
@@ -11,3 +12,5 @@
#define SW_DLLPRIVATE SAL_DLLPRIVATE
#endif /* INCLUDED_SWDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index 6be90ef..cb11a51 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -110,3 +111,4 @@ inline bool IsError( ULONG nErr )
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swstyle.h b/sw/inc/swstyle.h
index f44560f..d909b64 100644
--- a/sw/inc/swstyle.h
+++ b/sw/inc/swstyle.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 3330337..0fe5dcb 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -155,3 +156,5 @@
#define MID_WRAP_INFLUENCE 0
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/sdi/swinterf.c b/sw/sdi/swinterf.c
index 1a984ea..a9983a2 100644
--- a/sw/sdi/swinterf.c
+++ b/sw/sdi/swinterf.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -247,3 +248,4 @@ short SwParagrDlg(void *pHandle)
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index c97f437..7e61c50 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,5 @@ namespace com { namespace sun { namespace star { namespace uno {
String& GetString( const com::sun::star::uno::Any&, String& rStr );
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index d9d6670..33c490f 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -28,8 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#include <tools/stream.hxx>
#include <hintids.hxx>
@@ -531,6 +529,4 @@ void SwASCIIParser::InsertText( const String& rStr )
nScript |= pBreakIt->GetAllScriptsOfText( rStr );
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index d294b78..4f73757 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -627,6 +627,4 @@ SW_DLLPUBLIC void UpdatePageDescs(SwDoc &rDoc, sal_uInt16 nInPageDescOffset);
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 77ffdf7..9eec3df 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
/// @HTML
#ifndef SW_MS_MSFILTER_HXX
@@ -526,6 +525,5 @@ namespace sw
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index d41b4d6..0daf91a 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
/// @HTML
#ifndef WW_WWSTYLES_HXX
#define WW_WWSTYLES_HXX
@@ -219,6 +218,5 @@ namespace ww
} // namespace ww
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index c0148d6..fcf0104 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <ctype.h>
#include <hintids.hxx>
@@ -1224,6 +1223,4 @@ INSINGLECHAR:
SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 7446027..4f1ba5a 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <hintids.hxx>
#include <tools/list.hxx>
#include <tools/cachestr.hxx>
@@ -1629,6 +1628,4 @@ void SwRTFParser::ReadOLEData()
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx
index 59f2248..674bc57 100644
--- a/sw/source/filter/rtf/rtftbl.cxx
+++ b/sw/source/filter/rtf/rtftbl.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifdef WTC
#define private public
@@ -1024,6 +1023,4 @@ void SwRTFParser::CheckInsNewTblLine()
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 51a8124..24ab947 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <hintids.hxx>
#include <stack>
@@ -4397,6 +4396,4 @@ xub_StrLen SwxPosition::GetCntIdx() const
return pPam->GetPoint()->nContent.GetIndex();
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx
index 8956ef6..b995d4d 100644
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ b/sw/source/filter/rtf/swparrtf.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef _SWPARRTF_HXX
#define _SWPARRTF_HXX
@@ -481,6 +480,4 @@ public:
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 607a3cf..da7d4ea 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -2086,6 +2086,4 @@ void UpdatePageDescs(SwDoc &rDoc, sal_uInt16 nInPageDescOffset)
rDoc.ChgPageDesc(i, const_cast<const SwDoc &>(rDoc).GetPageDesc(i));
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/WW8FibData.cxx b/sw/source/filter/ww8/WW8FibData.cxx
index 555007a..6a9cddd 100644
--- a/sw/source/filter/ww8/WW8FibData.cxx
+++ b/sw/source/filter/ww8/WW8FibData.cxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include "WW8FibData.hxx"
diff --git a/sw/source/filter/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx
index a5f4717..d529998 100644
--- a/sw/source/filter/ww8/WW8FibData.hxx
+++ b/sw/source/filter/ww8/WW8FibData.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef INCLUDED_WW8_FIB_DATA_HXX
#define INCLUDED_WW8_FIB_DATA_HXX
#include <IDocumentExternalData.hxx>
diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx
index 8343362..28f3135 100644
--- a/sw/source/filter/ww8/WW8Sttbf.cxx
+++ b/sw/source/filter/ww8/WW8Sttbf.cxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <iostream>
#include <dbgoutsw.hxx>
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 5939618..e1ce528 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <vector>
#include <boost/shared_ptr.hpp>
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index ca2ee70..45a1574 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -582,6 +582,4 @@ public:
#endif // _ATTRIBUTEOUTPUTBASE_HXX_
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 3048269..a6326f1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -616,6 +616,4 @@ public:
#endif // _DOCXATTRIBUTEOUTPUT_HXX_
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 4ccf208..c836cd1 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -715,6 +715,4 @@ DocxExport::~DocxExport()
delete m_pDrawingML, m_pDrawingML = NULL;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index c42b23c..81d2a02 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -212,6 +212,5 @@ private:
};
#endif // _DOCXEXPORT_HXX_
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 0bd0e16..771e495 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -232,6 +232,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplN
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index ae9cb6d..a3ec5c1 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -60,6 +60,5 @@ private:
};
#endif // _DOCXEXPORTFILTER_HXX_
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx
index 0184ba5..b4f2341 100644
--- a/sw/source/filter/ww8/dump/ww8scan.cxx
+++ b/sw/source/filter/ww8/dump/ww8scan.cxx
@@ -29,9 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
-
#include <algorithm>
#include <functional>
@@ -6665,6 +6662,4 @@ SEPr::SEPr() :
memset(rgdxaColumnWidthSpacing, 0, sizeof(rgdxaColumnWidthSpacing));
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index d01e799..163763b 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef _ESCHER_HXX
#define _ESCHER_HXX
@@ -185,6 +183,4 @@ private:
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index 4927f0f..a819a03 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include "fields.hxx"
#include <errhdl.hxx> //ASSERT (use our own ww header later for asserts)
#include <sal/macros.h>
@@ -150,6 +149,4 @@ namespace ww
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx
index 4e0d990..b70f816 100644
--- a/sw/source/filter/ww8/fields.hxx
+++ b/sw/source/filter/ww8/fields.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
/// @HTML
#ifndef WW_FIELDS_HXX
#define WW_FIELDS_HXX
@@ -155,6 +154,5 @@ namespace ww
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx
index 84844c8..6b3a56f 100644
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ b/sw/source/filter/ww8/hash_wrap.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
//this is a shameless rip from sortedarray.hxx but changed to hash_set
#ifndef WW_HASH_WRAP_HXX
@@ -122,6 +120,4 @@ namespace ww
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx
index 8d6eafa..8506fff 100644
--- a/sw/source/filter/ww8/needed_cast.hxx
+++ b/sw/source/filter/ww8/needed_cast.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef WW_NEEDED_CAST_HXX
#define WW_NEEDED_CAST_HXX
@@ -61,6 +60,5 @@ namespace ww
}
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 98e2830..ad87b8e 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3422,6 +3422,4 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size&
m_aRunText.append(m_rExport.sNewLine);
}
-/* vi:set shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 8ac8170..bf7bf8a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -587,6 +587,4 @@ public:
#endif // _RTFATTRIBUTEOUTPUT_HXX_
-/* vi:set shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 37735dc..c9912c8 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1264,6 +1264,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportRTF( const String& rFltName,
xRet = new SwRTFWriter( rFltName, rBaseURL );
}
-/* vi:set shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index bf65371..2f6bfce 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -211,6 +211,5 @@ private:
};
#endif // _RTFEXPORT_HXX_
-/* vi:set shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index f77b1d6..8915429 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -134,6 +134,4 @@ uno::Reference< uno::XInterface > SAL_CALL RtfExport_createInstance(const uno::R
return (cppu::OWeakObject*) new RtfExportFilter( rSMgr );
}
-/* vi:set shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index faa01ae..c6589a4 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -82,6 +82,5 @@ public:
#define IMPL_NAME_RTFEXPORT "com.sun.star.comp.Writer.RtfExport"
#endif // _RTFEXPORTFILTER_HXX_
-/* vi:set shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfimportfilter.cxx b/sw/source/filter/ww8/rtfimportfilter.cxx
index 83d71db..0e8b2a2 100644
--- a/sw/source/filter/ww8/rtfimportfilter.cxx
+++ b/sw/source/filter/ww8/rtfimportfilter.cxx
@@ -132,6 +132,4 @@ uno::Reference< uno::XInterface > SAL_CALL RtfImport_createInstance(const uno::R
return (cppu::OWeakObject*) new RtfImportFilter( rSMgr );
}
-/* vi:set shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfimportfilter.hxx b/sw/source/filter/ww8/rtfimportfilter.hxx
index 9f6b55e..6053289 100644
--- a/sw/source/filter/ww8/rtfimportfilter.hxx
+++ b/sw/source/filter/ww8/rtfimportfilter.hxx
@@ -72,6 +72,5 @@ public:
#define IMPL_NAME_RTFIMPORT "com.sun.star.comp.Writer.RtfImport"
#endif // _RTFIMPORTFILTER_HXX_
-/* vi:set shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 4f30b18..cfe0d26 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -575,6 +575,4 @@ UINT32 RtfSdrExport::AddSdrObject( const SdrObject& rObj )
return EscherEx::AddSdrObject(rObj);
}
-/* vi:set shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index 545d4fe..305eafb 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -109,6 +109,5 @@ private:
};
#endif // _RTFSdrEXPORT_HXX_
-/* vi:set shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index af1ede3..479f43c 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef WW_SORTEDARRAY_HXX
#define WW_SORTEDARRAY_HXX
@@ -119,6 +117,4 @@ namespace ww
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/staticassert.hxx b/sw/source/filter/ww8/staticassert.hxx
index dcfdaab..d2a998c 100644
--- a/sw/source/filter/ww8/staticassert.hxx
+++ b/sw/source/filter/ww8/staticassert.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef WW_STATICASSERT_HXX
#define WW_STATICASSERT_HXX
@@ -69,6 +68,5 @@ namespace ww
#endif
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index 16326fb..928c140 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include "../inc/wwstyles.hxx"
#include <functional> //std::unary_function
@@ -216,6 +215,4 @@ namespace ww
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/tracer.cxx b/sw/source/filter/ww8/tracer.cxx
index f4017de..fe31419 100644
--- a/sw/source/filter/ww8/tracer.cxx
+++ b/sw/source/filter/ww8/tracer.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <tools/urlobj.hxx> //INetURLObject
#include <sfx2/docfile.hxx> //SfxMedium
#include <filter/msfilter/msfiltertracer.hxx> //MSFilterTracer
@@ -207,6 +206,4 @@ namespace sw
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/tracer.hxx b/sw/source/filter/ww8/tracer.hxx
index d067013..1d88586 100644
--- a/sw/source/filter/ww8/tracer.hxx
+++ b/sw/source/filter/ww8/tracer.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef SW_TRACER_HXX
#define SW_TRACER_HXX
@@ -89,6 +87,5 @@ namespace sw
}
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx
index 8172839..af9df20 100644
--- a/sw/source/filter/ww8/types.hxx
+++ b/sw/source/filter/ww8/types.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef WW_TYPES
#define WW_TYPES
@@ -56,6 +54,5 @@ namespace ww
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/typessw.hxx b/sw/source/filter/ww8/typessw.hxx
index ebe1c98..0c35a3b 100644
--- a/sw/source/filter/ww8/typessw.hxx
+++ b/sw/source/filter/ww8/typessw.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef WW_TYPESSW
#define WW_TYPESSW
@@ -44,6 +42,5 @@ namespace ww
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 05ae118..86a1478 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <com/sun/star/util/XCloseable.hpp>
@@ -842,6 +841,5 @@ namespace sw
*/
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index fab98c1..fed6f83 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
/// @HTML
#ifndef SW_WRITERHELPER
@@ -962,6 +961,5 @@ namespace sw
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 2ec8af3..5e2c418 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
/// @HTML
#include <msfilter.hxx>
# include "writerwordglue.hxx"
@@ -1045,6 +1044,4 @@ namespace sw
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx
index 9559e24..09af0d9 100644
--- a/sw/source/filter/ww8/writerwordglue.hxx
+++ b/sw/source/filter/ww8/writerwordglue.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
/// @HTML
#ifndef SW_WRITERWORDGLUE
@@ -162,6 +161,5 @@ namespace sw
}
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index b0e8300..866bb5f 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <com/sun/star/embed/Aspects.hpp>
@@ -2843,6 +2842,4 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
return true;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 74c10aa..277387a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <vector>
#include <list>
@@ -2740,6 +2739,4 @@ void MSWordExportBase::OutputContentNode( const SwCntntNode& rNode )
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 9457f60..8a09059 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#include <hintids.hxx>
#include <vcl/font.hxx>
#include <editeng/fontitem.hxx>
@@ -957,6 +955,4 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
return bRet;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 8415449..be01cee 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#include <algorithm>
#include <functional>
@@ -2306,6 +2304,4 @@ const SvULongs* WW8_WrPlcSubDoc::GetShapeIdArr() const
return 0;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 365e99c..798bfe0 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <iostream>
@@ -3815,6 +3814,4 @@ void MSWordExportBase::OutputEndNode( const SwEndNode &rNode )
#endif
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index b6b9f22..0a034d9 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef _WRTWW8_HXX
#define _WRTWW8_HXX
@@ -1556,6 +1555,4 @@ struct WW8_PdAttrDesc
#endif // _WRTWW8_HXX
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index abd7843..7988df8 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#if OSL_DEBUG_LEVEL > 0
# include <cstdio>
#endif
@@ -932,6 +930,4 @@ void SwWW8WrGrf::Write()
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 9bbdab3..b322648 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
/*
* This file contains methods for the WW8 output
@@ -5296,6 +5295,4 @@ void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, BOOL bDeep
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index a884d81..5300b85 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -453,6 +453,4 @@ protected:
#endif // _WW8ATTRIBUTEOUTPUT_HXX_
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 975a6ce..030f36f 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
#include <rtl/tencinfo.h>
@@ -270,6 +269,4 @@ UINT32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream & /* rTableStrm */,
return nGlossaryFibOffset;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 8c4fd92..af8b9ad 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef _WW8GLSY_HXX
#define _WW8GLSY_HXX
@@ -90,6 +89,4 @@ private:
};
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 545e375..23bf0d6 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <svl/urihelper.hxx>
#include <hintids.hxx>
#include <osl/endian.h>
@@ -3279,6 +3278,4 @@ void SwWW8FltAnchorStack::Flush()
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx
index c6a1940..21523f4 100644
--- a/sw/source/filter/ww8/ww8graf.hxx
+++ b/sw/source/filter/ww8/ww8graf.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef _WW8GRAF_HXX
#define _WW8GRAF_HXX
@@ -106,6 +104,4 @@ public:
void WW8FSPAShadowToReal( WW8_FSPA_SHADOW* pFSPAS, WW8_FSPA* pPic );
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 3ad72b4..29633f9 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -28,8 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#include <iterator>
#include <hintids.hxx>
@@ -822,6 +820,4 @@ void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA )
}
#endif // defined __WW8_NEEDS_COPY
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index a603f22..e3557d1 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <hash_set>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -5399,6 +5398,4 @@ namespace sw
}
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 8e7b05a..a4b6632 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef _WW8PAR_HXX
#define _WW8PAR_HXX
@@ -1631,6 +1630,4 @@ bool RTLDrawingsHack(long &rLeft, long nWidth,
SwTwips nPageRight, SwTwips nPageSize);
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index f18fee0..f52a173 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <tools/solar.h>
#include <vcl/vclenum.hxx>
@@ -4737,6 +4736,4 @@ CharSet SwWW8StyInf::GetCJKCharSet() const
return eCJKFontSrcCharSet;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 0aacbde..0886fe2 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef _WW8PAR2_HXX
#define _WW8PAR2_HXX
@@ -287,6 +286,4 @@ enum WW8LvlType {WW8_None, WW8_Outline, WW8_Numbering, WW8_Sequence, WW8_Pause};
WW8LvlType GetNumType(BYTE nWwLevelNo);
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index b9bdc3f..62ee798 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -28,8 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#include <svl/itemiter.hxx>
#include <vcl/svapp.hxx>
@@ -2640,8 +2638,4 @@ sal_Bool SwMSConvertControls::InsertControl(
return sal_True;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index f898a0d..897f36d 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <doc.hxx>
#include "writerhelper.hxx"
#include <com/sun/star/embed/XClassifiedObject.hpp>
@@ -579,6 +578,4 @@ void SwWW8ImplReader::Read_CPropRMark(USHORT , const BYTE* pData, short nLen)
Read_CRevisionMark( nsRedlineType_t::REDLINE_FORMAT, pData, nLen );
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 6f1bc14..4b3f7c8 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -28,8 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#include <ctype.h> // tolower
#include <stdio.h> // sscanf()
@@ -3745,6 +3743,4 @@ void SwWW8ImplReader::Read_FldVanish( USHORT, const BYTE*, short nLen )
pStrm->Seek( nOldPos );
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index aefc10e..469ded1 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <stdlib.h>
#include <svl/itemiter.hxx>
#include <rtl/tencinfo.h>
@@ -6259,6 +6258,4 @@ short SwWW8ImplReader::ImportSprm(const BYTE* pPos,USHORT nId)
return nL;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index de0848b..4dee737 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -28,10 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include "ww8scan.hxx"
-
#include <functional>
#include <algorithm>
@@ -7380,6 +7378,4 @@ SEPr::SEPr() :
memset(rgdxaColumnWidthSpacing, 0, sizeof(rgdxaColumnWidthSpacing));
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 7cea91a..350ffdb 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef _WW8SCAN_HXX
#define _WW8SCAN_HXX
@@ -1784,6 +1782,4 @@ const USHORT lLetterHeight = 15842;
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index d72dce9..a178535 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
-
#ifndef _WW8STRUC_HXX
#define _WW8STRUC_HXX
@@ -1009,6 +1007,4 @@ namespace wwUtility
#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/cfgid.h b/sw/source/ui/inc/cfgid.h
index 9496aa6..b8b794b 100644
--- a/sw/source/ui/inc/cfgid.h
+++ b/sw/source/ui/inc/cfgid.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,5 @@
#define CFG_SWGLOBAL_MENU (SFX_ITEMTYPE_SW_BEGIN +29)
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/globals.h b/sw/source/ui/inc/globals.h
index d176d54..7a40439 100644
--- a/sw/source/ui/inc/globals.h
+++ b/sw/source/ui/inc/globals.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,3 +36,5 @@ enum SwChangeState
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/hidfunc.h b/sw/source/ui/inc/hidfunc.h
index 9766f35..0dd616e 100644
--- a/sw/source/ui/inc/hidfunc.h
+++ b/sw/source/ui/inc/hidfunc.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -348,3 +349,5 @@
#define HID_FAX_WIZZARD 1661
#define HID_LETTER_WIZZARD 1660
#define HID_LAUNCH_REGISTRY 1002
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/titlepage.hxx b/sw/source/ui/inc/titlepage.hxx
index f72ee66..44230b9 100644
--- a/sw/source/ui/inc/titlepage.hxx
+++ b/sw/source/ui/inc/titlepage.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -97,3 +98,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit babbd10f8616781e340abb6202d75f17ef577b42
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 27 11:38:46 2010 +0100
micro optimizations
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index d439f97..2823b10 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -112,7 +112,7 @@ class SwNoteProps: public utl::ConfigItem
bool bIsShowAnchor;
public:
SwNoteProps()
- : ConfigItem(::rtl::OUString::createFromAscii("Office.Writer/Notes"))
+ : ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Notes")))
, bIsShowAnchor(false)
{
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames = GetPropertyNames();
@@ -127,23 +127,17 @@ class SwNoteProps: public utl::ConfigItem
{
return bIsShowAnchor;
}
- ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetPropertyNames()
- {
+ ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetPropertyNames()
+ {
static ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames;
- if(!aNames.getLength())
- {
- static const char* aPropNames[] =
- {
- "ShowAnkor"
- };
- const int nCount = sizeof(aPropNames)/sizeof(const char*);
- aNames.realloc(nCount);
- ::rtl::OUString* pNames = aNames.getArray();
- for(int i = 0; i < nCount; i++)
- pNames[i] = ::rtl::OUString::createFromAscii(aPropNames[i]);
- }
- return aNames;
+ if(!aNames.getLength())
+ {
+ aNames.realloc(1);
+ ::rtl::OUString* pNames = aNames.getArray();
+ pNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowAnkor"));
}
+ return aNames;
+ }
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index f774805..1da057e 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1471,7 +1471,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes(
_getDefaultAttributesImpl( aRequestedAttributes, aDefAttrSeq );
// --> OD 2010-03-08 #i92233#
- static rtl::OUString sMMToPixelRatio( rtl::OUString::createFromAscii( "MMToPixelRatio" ) );
+ static rtl::OUString sMMToPixelRatio(RTL_CONSTASCII_USTRINGPARAM("MMToPixelRatio"));
bool bProvideMMToPixelRatio( false );
{
if ( aRequestedAttributes.getLength() == 0 )
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index f4d4c77..68e6308 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -46,7 +46,7 @@ SwSmartTagMgr& SwSmartTagMgr::Get()
if ( !mpTheSwSmartTagMgr )
{
mpTheSwSmartTagMgr = new SwSmartTagMgr( SwDocShell::Factory().GetModuleName() );
- mpTheSwSmartTagMgr->Init( rtl::OUString::createFromAscii("Writer") );
+ mpTheSwSmartTagMgr->Init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")));
}
return *mpTheSwSmartTagMgr;
}
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index fc56b9d..b670b13 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -72,12 +72,12 @@ SwBreakIt::SwBreakIt(
//{
// xBreak = uno::Reference< i18n::XBreakIterator >(
// m_xMSF->createInstance(
- // rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ),
+ // rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),
// uno::UNO_QUERY);
// xCTLDetect = uno::Reference< i18n::XScriptTypeDetector >(
// m_xMSF->createInstance(
- // rtl::OUString::createFromAscii( "com.sun.star.i18n.ScriptTypeDetector" ) ),
+ // rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.ScriptTypeDetector")) ),
// uno::UNO_QUERY);
// }
}
diff --git a/sw/source/core/bastyp/checkit.cxx b/sw/source/core/bastyp/checkit.cxx
index 49edc20..148e0b6 100644
--- a/sw/source/core/bastyp/checkit.cxx
+++ b/sw/source/core/bastyp/checkit.cxx
@@ -42,7 +42,7 @@ SwCheckIt::SwCheckIt()
{
Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
Reference < XInterface > xI = xMSF->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.i18n.InputSequenceChecker" ) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.InputSequenceChecker")) );
if ( xI.is() )
{
Any x = xI->queryInterface( ::getCppuType((const Reference< XExtendedInputSequenceChecker >*)0) );
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 4991c60..3b8f8bc 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -181,13 +181,13 @@ namespace sw { namespace mark
: MarkBase(rPaM, our_sNamePrefix)
{ }
- const ::rtl::OUString NavigatorReminder::our_sNamePrefix = ::rtl::OUString::createFromAscii("__NavigatorReminder__");
+ const ::rtl::OUString NavigatorReminder::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__NavigatorReminder__"));
UnoMark::UnoMark(const SwPaM& aPaM)
: MarkBase(aPaM, MarkBase::GenerateNewName(our_sNamePrefix))
{ }
- const ::rtl::OUString UnoMark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__UnoMark__");
+ const ::rtl::OUString UnoMark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__UnoMark__"));
DdeBookmark::DdeBookmark(const SwPaM& aPaM)
: MarkBase(aPaM, MarkBase::GenerateNewName(our_sNamePrefix))
@@ -199,7 +199,7 @@ namespace sw { namespace mark
m_aRefObj = pObj;
}
- const ::rtl::OUString DdeBookmark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__DdeLink__");
+ const ::rtl::OUString DdeBookmark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__DdeLink__"));
void DdeBookmark::DeregisterFromDoc(SwDoc* const pDoc)
{
@@ -309,7 +309,7 @@ namespace sw { namespace mark
aPaM.InvalidatePaM();
}
- const ::rtl::OUString Fieldmark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__Fieldmark__");
+ const ::rtl::OUString Fieldmark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__Fieldmark__"));
TextFieldmark::TextFieldmark(const SwPaM& rPaM)
: Fieldmark(rPaM)
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 953594d..97e093b 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -80,7 +80,7 @@ namespace sw { namespace mark
: CrossRefBookmark(rPaM, rCode, rName, rShortName, our_sNamePrefix)
{ }
- const ::rtl::OUString CrossRefHeadingBookmark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__RefHeading__");
+ const ::rtl::OUString CrossRefHeadingBookmark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__RefHeading__"));
bool CrossRefHeadingBookmark::IsLegalName(const ::rtl::OUString& rName)
{
@@ -94,7 +94,7 @@ namespace sw { namespace mark
: CrossRefBookmark(rPaM, rCode, rName, rShortName, our_sNamePrefix)
{ }
- const ::rtl::OUString CrossRefNumItemBookmark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__RefNumPara__");
+ const ::rtl::OUString CrossRefNumItemBookmark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__RefNumPara__"));
bool CrossRefNumItemBookmark::IsLegalName(const ::rtl::OUString& rName)
{
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 013324a..4a2d18f 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -433,7 +433,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
bool bRemoveSoftHyphens = true;
if ( bRegSearch )
{
- const rtl::OUString a00AD( rtl::OUString::createFromAscii( "\\x00AD" ) );
+ const rtl::OUString a00AD(RTL_CONSTASCII_USTRINGPARAM("\\x00AD"));
if ( -1 != rSearchOpt.searchString.indexOf( a00AD ) )
bRemoveSoftHyphens = false;
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index d2d0d7d..ba62d33 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1785,22 +1785,22 @@ void SwDoc::UpdateDocStat( SwDocStat& rStat )
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( rStat.nPage ? 7 : 6);
sal_Int32 n=0;
- aStat[n].Name = ::rtl::OUString::createFromAscii("TableCount");
+ aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount"));
aStat[n++].Value <<= (sal_Int32)rStat.nTbl;
- aStat[n].Name = ::rtl::OUString::createFromAscii("ImageCount");
+ aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageCount"));
aStat[n++].Value <<= (sal_Int32)rStat.nGrf;
- aStat[n].Name = ::rtl::OUString::createFromAscii("ObjectCount");
+ aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectCount"));
aStat[n++].Value <<= (sal_Int32)rStat.nOLE;
if ( rStat.nPage )
{
- aStat[n].Name = ::rtl::OUString::createFromAscii("PageCount");
+ aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageCount"));
aStat[n++].Value <<= (sal_Int32)rStat.nPage;
}
- aStat[n].Name = ::rtl::OUString::createFromAscii("ParagraphCount");
+ aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphCount"));
aStat[n++].Value <<= (sal_Int32)rStat.nPara;
- aStat[n].Name = ::rtl::OUString::createFromAscii("WordCount");
+ aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WordCount"));
aStat[n++].Value <<= (sal_Int32)rStat.nWord;
- aStat[n].Name = ::rtl::OUString::createFromAscii("CharacterCount");
+ aStat[n].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterCount"));
aStat[n++].Value <<= (sal_Int32)rStat.nChar;
// For e.g. autotext documents there is no pSwgInfo (#i79945)
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index db90e87..a8d2138 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -569,7 +569,7 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, sal_Bool bMoveWithinDoc,
uno::Reference< awt::XControlModel > xModel = ((SdrUnoObj*)pObj)->GetUnoControlModel();
uno::Any aVal;
uno::Reference< beans::XPropertySet > xSet(xModel, uno::UNO_QUERY);
- OUString sName( rtl::OUString::createFromAscii("Name") );
+ OUString sName(RTL_CONSTASCII_USTRINGPARAM("Name"));
if( xSet.is() )
aVal = xSet->getPropertyValue( sName );
if( bInsInPage )
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index aff5ceb..01f353d 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -149,7 +149,7 @@ SV_IMPL_PTRARR( SwGrfFmtColls, SwGrfFmtCollPtr)
{
try
{
- rtl::OUString aServiceName( rtl::OUString::createFromAscii("com.sun.star.linguistic2.ProofreadingIterator") );
+ rtl::OUString aServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ProofreadingIterator"));
m_xGCIterator = uno::Reference< linguistic2::XProofreadingIterator >
( xMgr->createInstance( aServiceName ), uno::UNO_QUERY_THROW );
}
@@ -1007,13 +1007,13 @@ void SwDoc::SetApplyWorkaroundForB6375613( bool p_bApplyWorkaroundForB6375613 )
if ( mbApplyWorkaroundForB6375613 )
{
xDocInfo->addProperty(
- rtl::OUString::createFromAscii("WorkaroundForB6375613Applied"),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkaroundForB6375613Applied")),
beans::PropertyAttribute::TRANSIENT | beans::PropertyAttribute::REMOVABLE,
uno::makeAny( false ) );
}
else
{
- xDocInfo->removeProperty( rtl::OUString::createFromAscii("WorkaroundForB6375613Applied") );
+ xDocInfo->removeProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkaroundForB6375613Applied")) );
}
}
catch( uno::Exception& )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index afa70c9..6c3256e 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1269,7 +1269,7 @@ namespace numfunc
SwDefBulletConfig* SwDefBulletConfig::mpInstance = 0;
SwDefBulletConfig::SwDefBulletConfig()
- : ConfigItem( rtl::OUString::createFromAscii("Office.Writer/Numbering/DefaultBulletList") ),
+ : ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Numbering/DefaultBulletList")) ),
// default bullet font is now OpenSymbol
msFontname( String::CreateFromAscii("OpenSymbol") ),
mbUserDefinedFontname( false ),
@@ -1322,19 +1322,19 @@ namespace numfunc
{
uno::Sequence<rtl::OUString> aPropNames(13);
rtl::OUString* pNames = aPropNames.getArray();
- pNames[0] = rtl::OUString::createFromAscii("BulletFont/FontFamilyname");
- pNames[1] = rtl::OUString::createFromAscii("BulletFont/FontWeight");
- pNames[2] = rtl::OUString::createFromAscii("BulletFont/FontItalic");
- pNames[3] = rtl::OUString::createFromAscii("BulletCharLvl1");
- pNames[4] = rtl::OUString::createFromAscii("BulletCharLvl2");
- pNames[5] = rtl::OUString::createFromAscii("BulletCharLvl3");
- pNames[6] = rtl::OUString::createFromAscii("BulletCharLvl4");
- pNames[7] = rtl::OUString::createFromAscii("BulletCharLvl5");
- pNames[8] = rtl::OUString::createFromAscii("BulletCharLvl6");
- pNames[9] = rtl::OUString::createFromAscii("BulletCharLvl7");
- pNames[10] = rtl::OUString::createFromAscii("BulletCharLvl8");
- pNames[11] = rtl::OUString::createFromAscii("BulletCharLvl9");
- pNames[12] = rtl::OUString::createFromAscii("BulletCharLvl10");
+ pNames[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFont/FontFamilyname"));
+ pNames[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFont/FontWeight"));
+ pNames[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletFont/FontItalic"));
+ pNames[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl1"));
+ pNames[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl2"));
+ pNames[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl3"));
+ pNames[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl4"));
+ pNames[7] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl5"));
+ pNames[8] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl6"));
+ pNames[9] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl7"));
+ pNames[10] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl8"));
+ pNames[11] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl9"));
+ pNames[12] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BulletCharLvl10"));
return aPropNames;
}
@@ -1501,7 +1501,7 @@ namespace numfunc
SwNumberingUIBehaviorConfig* SwNumberingUIBehaviorConfig::mpInstance = 0;
SwNumberingUIBehaviorConfig::SwNumberingUIBehaviorConfig()
- : ConfigItem( rtl::OUString::createFromAscii("Office.Writer/Numbering/UserInterfaceBehavior") ),
+ : ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Numbering/UserInterfaceBehavior")) ),
mbChangeIndentOnTabAtFirstPosOfFirstListItem( sal_True )
{
SetToDefault();
@@ -1520,7 +1520,7 @@ namespace numfunc
{
com::sun::star::uno::Sequence<rtl::OUString> aPropNames(1);
rtl::OUString* pNames = aPropNames.getArray();
- pNames[0] = rtl::OUString::createFromAscii("ChangeIndentOnTabAtFirstPosOfFirstListItem");
+ pNames[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChangeIndentOnTabAtFirstPosOfFirstListItem"));
return aPropNames;
}
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx
index eeb65c6..cddae56 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -61,7 +61,7 @@ SwAsyncRetrieveInputStreamThread::~SwAsyncRetrieveInputStreamThread()
void SwAsyncRetrieveInputStreamThread::threadFunction()
{
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > xProps( 1 );
- xProps[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+ xProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
xProps[0].Value <<= ::rtl::OUString( mrLinkedURL );
comphelper::MediaDescriptor aMedium( xProps );
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx
index 36a0c81..15df350 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -49,7 +49,7 @@ uno::Reference< util::XJobManager >& SwThreadJoiner::GetThreadJoiner()
mpThreadJoiner =
uno::Reference< util::XJobManager >(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.util.JobManager" ) ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.JobManager")) ),
uno::UNO_QUERY );
}
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index 3afb03f..74f3b60 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -55,7 +55,7 @@ BOOL SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const
uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
if( !xMgr.is() )
return FALSE;
- uno::Reference<uno::XInterface> xInstance = xMgr->createInstance( OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" ));
+ uno::Reference<uno::XInterface> xInstance = xMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseContext")));
uno::Reference<container::XNameAccess> xDBContext(xInstance, uno::UNO_QUERY) ;
if(!xDBContext.is())
return FALSE;
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index cc0156f..fdf368b 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -994,7 +994,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
aAny = xSet->getPropertyValue( rName );
uno::Reference < script::XTypeConverter > xConverter( comphelper::getProcessServiceFactory()
- ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), uno::UNO_QUERY );
+ ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), uno::UNO_QUERY );
uno::Any aNew;
aNew = xConverter->convertToSimpleType( aAny, uno::TypeClass_STRING );
aNew >>= sVal;
@@ -1150,7 +1150,7 @@ String SwDocInfoField::Expand() const
// if the field is "fixed" we don't update it from the property
::rtl::OUString sVal;
uno::Reference < script::XTypeConverter > xConverter( comphelper::getProcessServiceFactory()
- ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), uno::UNO_QUERY );
+ ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), uno::UNO_QUERY );
util::Date aDate;
util::DateTime aDateTime;
util::Duration aDuration;
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 8e30134..998aeae 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -248,8 +248,8 @@ BOOL SwMacroField::isScriptURL( const String& str )
uno::Reference< uri::XUriReferenceFactory >
xFactory( xSMgr->createInstance(
- OUString::createFromAscii(
- "com.sun.star.uri.UriReferenceFactory" ) ), uno::UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.uri.UriReferenceFactory")) ), uno::UNO_QUERY );
if ( xFactory.is() )
{
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 1536398..15e44bc 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1776,7 +1776,7 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
if( xModel.is() )
{
uno::Any aVal;
- OUString sName = OUString::createFromAscii("ButtonType");
+ OUString sName(RTL_CONSTASCII_USTRINGPARAM("ButtonType"));
uno::Reference< beans::XPropertySet > xSet(xModel, uno::UNO_QUERY);
uno::Reference< beans::XPropertySetInfo > xInfo = xSet->getPropertySetInfo();
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 3525f2a..bd0c293 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -736,7 +736,7 @@ void lcl_ApplyWorkaroundForB6375613( SwFrm* p_pFirstFrmOnNewPage )
uno::UNO_QUERY );
try
{
- xDocInfo->setPropertyValue( rtl::OUString::createFromAscii("WorkaroundForB6375613Applied"), uno::makeAny( true ) );
+ xDocInfo->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkaroundForB6375613Applied")), uno::makeAny( true ) );
}
catch( uno::Exception& )
{
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 15edad1..2458dbc 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -918,7 +918,7 @@ String SwOLEObj::GetDescription()
SwOLELRUCache::SwOLELRUCache()
: SvPtrarr( 64, 16 ),
- utl::ConfigItem( OUString::createFromAscii( "Office.Common/Cache" )),
+ utl::ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Cache"))),
nLRU_InitSize( 20 ),
bInUnload( sal_False )
{
@@ -930,7 +930,7 @@ uno::Sequence< rtl::OUString > SwOLELRUCache::GetPropertyNames()
{
Sequence< OUString > aNames( 1 );
OUString* pNames = aNames.getArray();
- pNames[0] = OUString::createFromAscii( "Writer/OLE_Objects" );
+ pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/OLE_Objects"));
return aNames;
}
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index bb454a1..5cea681 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -123,7 +123,7 @@ ULONG SwXMLTextBlocks::GetDoc( USHORT nIdx )
// get parser
uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
- OUString::createFromAscii("com.sun.star.xml.sax.Parser") );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")));
ASSERT( xXMLParser.is(),
"XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
if( !xXMLParser.is() )
@@ -205,7 +205,7 @@ ULONG SwXMLTextBlocks::GetMacroTable( USHORT nIdx,
long nTmp = SOT_FORMATSTR_ID_STARWRITER_60;
sal_Bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp );
- OUString sStreamName = OUString::createFromAscii("atevent.xml");
+ OUString sStreamName(RTL_CONSTASCII_USTRINGPARAM("atevent.xml"));
uno::Reference < io::XStream > xDocStream = xRoot->openStreamElement(
sStreamName, embed::ElementModes::READ );
DBG_ASSERT(xDocStream.is(), "Can't create stream");
@@ -348,7 +348,7 @@ ULONG SwXMLTextBlocks::GetBlockText( const String& rShort, String& rText )
// get parser
uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
- OUString::createFromAscii("com.sun.star.xml.sax.Parser") );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
ASSERT( xXMLParser.is(),
"XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
if( !xXMLParser.is() )
@@ -504,7 +504,7 @@ void SwXMLTextBlocks::ReadInfo( void )
// get parser
uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
- OUString::createFromAscii("com.sun.star.xml.sax.Parser") );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")));
ASSERT( xXMLParser.is(),
"XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
if( !xXMLParser.is() )
@@ -663,7 +663,7 @@ ULONG SwXMLTextBlocks::SetMacroTable(
// get XML writer
uno::Reference< io::XActiveDataSource > xSaxWriter(
xServiceFactory->createInstance(
- OUString::createFromAscii("com.sun.star.xml.sax.Writer") ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) ),
UNO_QUERY );
ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
if( xSaxWriter.is() )
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index e562f04..2733a19 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -48,8 +48,8 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
try {
STAR_REFERENCE( uno::XInterface ) xI =
- rxMSF->createInstance( ::rtl::OUString::createFromAscii(
- "com.sun.star.i18n.IndexEntrySupplier" ) );
+ rxMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.i18n.IndexEntrySupplier")) );
if( xI.is() )
{
UNO_NMSPC::Any x = xI->queryInterface( ::getCppuType(
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index d024112..1248150 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -80,7 +80,7 @@ BOOL UCB_DeleteFile( const String& rURL )
ucbhelper::Content aTempContent( rURL,
STAR_REFERENCE( ucb::XCommandEnvironment )());
aTempContent.executeCommand(
- rtl::OUString::createFromAscii( "delete" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
UNO_NMSPC::makeAny( sal_Bool( sal_True ) ) );
bRemoved = TRUE;
}
@@ -113,7 +113,7 @@ BOOL UCB_CopyFile( const String& rURL, const String& rNewURL, BOOL bCopyIsMove )
aInfo.MoveData = bCopyIsMove;
aAny <<= aInfo;
aTempContent.executeCommand(
- rtl::OUString::createFromAscii( "transfer" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
aAny );
}
catch( UNO_NMSPC::Exception& )
@@ -164,7 +164,7 @@ BOOL UCB_IsReadOnlyFileName( const String& rURL )
{
ucbhelper::Content aCnt( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )());
UNO_NMSPC::Any aAny = aCnt.getPropertyValue(
- rtl::OUString::createFromAscii( "IsReadOnly" ));
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly")));
if(aAny.hasValue())
bIsReadOnly = *(sal_Bool*)aAny.getValue();
}
@@ -221,9 +221,9 @@ BOOL UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList,
USHORT nSeqSize = pDateTimeList ? 2 : 1;
UNO_NMSPC::Sequence < rtl::OUString > aProps( nSeqSize );
rtl::OUString* pProps = aProps.getArray();
- pProps[ 0 ] = rtl::OUString::createFromAscii( "Title" );
+ pProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
if( pDateTimeList )
- pProps[ 1 ] = rtl::OUString::createFromAscii( "DateModified" );
+ pProps[ 1 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified"));
try
{
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 27b39c1..99a3ee8 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -242,7 +242,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
UnoActionContext aCont(m_pImpl->m_pDoc);
if (!m_pImpl->m_sMarkName.getLength())
{
- m_pImpl->m_sMarkName = OUString::createFromAscii("Bookmark");
+ m_pImpl->m_sMarkName = OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"));
}
if ((eType == IDocumentMarkAccess::BOOKMARK) &&
::sw::mark::CrossRefNumItemBookmark::IsLegalName(m_pImpl->m_sMarkName))
@@ -388,7 +388,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXBookmark::getImplementationName() throw (uno::RuntimeException)
{
- return OUString::createFromAscii("SwXBookmark");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXBookmark"));
}
static char const*const g_ServicesBookmark[] =
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 67073a9..373ed9c 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -603,7 +603,7 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16
{
uno::Sequence< uno::Any > aArgs(1);
aArgs[ 0 ] <<= pDoc->GetDocShell()->GetModel();
- aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals"), aArgs );
+ aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Globals")), aArgs );
pDoc->GetDocShell()->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
}
aGlobs >>= xRet;
@@ -1605,18 +1605,18 @@ uno::Reference< XTextSection > SwXTextSections::GetObject( SwSectionFmt& rFmt )
OUString SwXBookmarks::getImplementationName(void) throw( RuntimeException )
{
- return OUString::createFromAscii("SwXBookmarks");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXBookmarks"));
}
BOOL SwXBookmarks::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
- return OUString::createFromAscii("com.sun.star.text.Bookmarks") == rServiceName;
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmarks")) == rServiceName;
}
Sequence< OUString > SwXBookmarks::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii("com.sun.star.text.Bookmarks");
+ aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmarks"));
return aRet;
}
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index b69ace2..360b8cc 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1052,7 +1052,7 @@ void makeRedline( SwPaM& rPaM,
//todo: what about REDLINE_FMTCOLL?
comphelper::SequenceAsHashMap aPropMap( rRedlineProperties );
uno::Any aAuthorValue;
- aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii("RedlineAuthor"), aAuthorValue);
+ aAuthorValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineAuthor")), aAuthorValue);
USHORT nAuthor = 0;
::rtl::OUString sAuthor;
if( aAuthorValue >>= sAuthor )
@@ -1060,7 +1060,7 @@ void makeRedline( SwPaM& rPaM,
::rtl::OUString sComment;
uno::Any aCommentValue;
- aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii("RedlineComment"), aCommentValue);
+ aCommentValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineComment")), aCommentValue);
SwRedlineData aRedlineData( eType, nAuthor );
if( aCommentValue >>= sComment )
@@ -1068,7 +1068,7 @@ void makeRedline( SwPaM& rPaM,
::util::DateTime aStamp;
uno::Any aDateTimeValue;
- aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii("RedlineDateTime"), aDateTimeValue);
+ aDateTimeValue = aPropMap.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedlineDateTime")), aDateTimeValue);
if( aDateTimeValue >>= aStamp )
{
aRedlineData.SetTimeStamp(
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 9cdbda4..c1a7d83 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2301,10 +2301,10 @@ OUString SwXTextField::getImplementationName(void) throw( uno::RuntimeException
static OUString OldNameToNewName_Impl( const OUString &rOld )
{
- static OUString aOldNamePart1( OUString::createFromAscii(".TextField.DocInfo.") );
- static OUString aOldNamePart2( OUString::createFromAscii(".TextField.") );
- static OUString aNewNamePart1( OUString::createFromAscii(".textfield.docinfo.") );
- static OUString aNewNamePart2( OUString::createFromAscii(".textfield.") );
+ static OUString aOldNamePart1(RTL_CONSTASCII_USTRINGPARAM(".TextField.DocInfo."));
+ static OUString aOldNamePart2(RTL_CONSTASCII_USTRINGPARAM(".TextField."));
+ static OUString aNewNamePart1(RTL_CONSTASCII_USTRINGPARAM(".textfield.docinfo."));
+ static OUString aNewNamePart2(RTL_CONSTASCII_USTRINGPARAM(".textfield."));
OUString sServiceNameCC( rOld );
sal_Int32 nIdx = sServiceNameCC.indexOf( aOldNamePart1 );
if (nIdx >= 0)
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index a2abf2d..ec5e26a 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2206,7 +2206,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
if( !aClassName.MakeId( aCLSID ) )
{
lang::IllegalArgumentException aExcept;
- aExcept.Message = OUString::createFromAscii("CLSID invalid");
+ aExcept.Message = OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID invalid"));
throw aExcept;
}
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 3ecc8bf..aca14a1 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -3042,7 +3042,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[nCurrentElement].Name = C2U("TokenType");
pArr[nCurrentElement++].Value <<=
- OUString::createFromAscii("TokenEntryNumber");
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TokenEntryNumber"));
pArr[nCurrentElement].Name = C2U("CharacterStyleName");
pArr[nCurrentElement++].Value <<= aProgCharStyle;
@@ -3082,7 +3082,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = C2U("TokenType");
- pArr[0].Value <<= OUString::createFromAscii("TokenEntryText");
+ pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenEntryText"));
pArr[1].Name = C2U("CharacterStyleName");
pArr[1].Value <<= aProgCharStyle;
@@ -3094,7 +3094,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = C2U("TokenType");
- pArr[0].Value <<= OUString::createFromAscii("TokenTabStop");
+ pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenTabStop"));
if(SVX_TAB_ADJUST_END == aToken.eTabAlign)
{
@@ -3125,7 +3125,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = C2U("TokenType");
- pArr[0].Value <<= OUString::createFromAscii("TokenText");
+ pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenText"));
pArr[1].Name = C2U("CharacterStyleName");
pArr[1].Value <<= aProgCharStyle;
@@ -3140,7 +3140,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = C2U("TokenType");
- pArr[0].Value <<= OUString::createFromAscii("TokenPageNumber");
+ pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenPageNumber"));
pArr[1].Name = C2U("CharacterStyleName");
pArr[1].Value <<= aProgCharStyle;
@@ -3152,7 +3152,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
beans::PropertyValue* pArr = rCurTokenSeq.getArray();
pArr[0].Name = C2U("TokenType");
- pArr[0].Value <<= OUString::createFromAscii("TokenChapterInfo");
+ pArr[0].Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TokenChapterInfo"));
pArr[1].Name = C2U("CharacterStyleName");
pArr[1].Value <<= aProgCharStyle;
@@ -3192,7 +3192,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[0].Name = C2U("TokenType");
pArr[0].Value <<=
- OUString::createFromAscii("TokenHyperlinkStart");
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkStart"));
pArr[1].Name = C2U("CharacterStyleName");
pArr[1].Value <<= aProgCharStyle;
}
@@ -3204,7 +3204,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[0].Name = C2U("TokenType");
pArr[0].Value <<=
- OUString::createFromAscii("TokenHyperlinkEnd");
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TokenHyperlinkEnd"));
}
break;
case TOKEN_AUTHORITY:
@@ -3214,7 +3214,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
pArr[0].Name = C2U("TokenType");
pArr[0].Value <<=
- OUString::createFromAscii("TokenBibliographyDataField");
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TokenBibliographyDataField"));
pArr[1].Name = C2U("CharacterStyleName");
pArr[1].Value <<= aProgCharStyle;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 16d4a81..d7d821c 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2972,7 +2972,7 @@ SwXTextCursor::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString::createFromAscii("com.sun.star.text.TextContent");
+ pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent"));
return aRet;
}
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 23019ef..fcaf6e3 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -917,7 +917,7 @@ throw (uno::RuntimeException)
OUString SAL_CALL
SwXTextRange::getImplementationName() throw (uno::RuntimeException)
{
- return OUString::createFromAscii("SwXTextRange");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("SwXTextRange"));
}
static char const*const g_ServicesTextRange[] =
@@ -1373,7 +1373,7 @@ SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException)
{
uno::Sequence< OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString::createFromAscii("com.sun.star.text.TextContent");
+ pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextContent"));
return aRet;
}
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 8c25664..4e8f763 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1598,7 +1598,7 @@ getPrefixAndSuffix(
throw;
} catch (uno::Exception & e) {
throw lang::WrappedTargetRuntimeException(
- ::rtl::OUString::createFromAscii("getPrefixAndSuffix: exception"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPrefixAndSuffix: exception")),
0, uno::makeAny(e));
}
}
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index e12b09a..4b83d53 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -149,7 +149,7 @@ BOOL SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s
try
{
ULONG nStgFmtId = SotStorage::GetFormatID( rStg );
- bRet = rStg->isStreamElement( ::rtl::OUString::createFromAscii("content.xml") );
+ bRet = rStg->isStreamElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")) );
if ( bRet )
bRet = ( nStgFmtId && ( rFilter.GetFormat() == nStgFmtId ) );
}
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 4bf9ee5..238524a 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -148,14 +148,14 @@ void SwApplet_Impl::CreateApplet( const String& rCode, const String& rName,
uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCode"), uno::makeAny( ::rtl::OUString( rCode ) ) );
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletName"), uno::makeAny( ::rtl::OUString( rName ) ) );
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletIsScript"), uno::makeAny( sal_Bool(bMayScript) ) );
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletDocBase"), uno::makeAny( ::rtl::OUString(sDocBase) ) );
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode")), uno::makeAny( ::rtl::OUString( rCode ) ) );
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletName")), uno::makeAny( ::rtl::OUString( rName ) ) );
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletIsScript")), uno::makeAny( sal_Bool(bMayScript) ) );
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletDocBase")), uno::makeAny( ::rtl::OUString(sDocBase) ) );
if ( rCodeBase.Len() )
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCodeBase"), uno::makeAny( ::rtl::OUString( rCodeBase ) ) );
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")), uno::makeAny( ::rtl::OUString( rCodeBase ) ) );
else
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCodeBase"), uno::makeAny( ::rtl::OUString( sDocBase ) ) );
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase")), uno::makeAny( ::rtl::OUString( sDocBase ) ) );
}
}
#ifdef SOLAR_JAVA
@@ -197,7 +197,7 @@ void SwApplet_Impl::FinishApplet()
{
uno::Sequence < beans::PropertyValue > aProps;
aCommandList.FillSequence( aProps );
- xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands"), uno::makeAny( aProps ) );
+ xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands")), uno::makeAny( aProps ) );
}
}
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 90d4cfc..422031d 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -133,7 +133,7 @@ void SwHTMLParser::EndScript()
if( aBasicLib.Len() )
aLibName = aBasicLib;
else
- aLibName = ::rtl::OUString::createFromAscii( "Standard" );
+ aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
// get module library container
Reference< script::XLibraryContainer > xModLibContainer( pDocSh->GetBasicContainer(), UNO_QUERY );
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 4140c60..fbd61c0 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -637,25 +637,25 @@ static void lcl_html_setFixedFontProperty(
DEFAULTFONT_FLAGS_ONLYONE ) );
Any aTmp;
aTmp <<= OUString( aFixedFont.GetName() );
- rPropSet->setPropertyValue( OUString::createFromAscii("FontName"), aTmp );
+ rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontName")), aTmp );
aTmp <<= OUString( aFixedFont.GetStyleName() );
- rPropSet->setPropertyValue( OUString::createFromAscii("FontStyleName"),
+ rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontStyleName")),
aTmp );
aTmp <<= (sal_Int16) aFixedFont.GetFamily();
- rPropSet->setPropertyValue( OUString::createFromAscii("FontFamily"), aTmp );
+ rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontFamily")), aTmp );
aTmp <<= (sal_Int16) aFixedFont.GetCharSet();
- rPropSet->setPropertyValue( OUString::createFromAscii("FontCharset"),
+ rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontCharset")),
aTmp );
aTmp <<= (sal_Int16) aFixedFont.GetPitch();
- rPropSet->setPropertyValue( OUString::createFromAscii("FontPitch"), aTmp );
+ rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontPitch")), aTmp );
float fVal(10.);
aTmp.setValue( &fVal, ::getCppuType(&fVal ));
- rPropSet->setPropertyValue( OUString::createFromAscii("FontHeight"), aTmp );
+ rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight")), aTmp );
}
class SwHTMLFormPendingStackData_Impl: public SwPendingStackData
@@ -969,7 +969,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
uno::Reference< XInterface > xCreate =
rServiceFactory ->createInstance(
- OUString::createFromAscii("com.sun.star.drawing.ControlShape"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")));
if( !xCreate.is() )
return xShape;
@@ -1009,11 +1009,11 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
Any aAny2;
aAny2 <<= (sal_Int32)nLeftSpace;
xShapePropSet->setPropertyValue(
- OUString::createFromAscii( "LeftMargin" ), aAny2 );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("LeftMargin")), aAny2 );
aAny2 <<= (sal_Int32)nRightSpace;
xShapePropSet->setPropertyValue(
- OUString::createFromAscii( "RightMargin" ), aAny2 );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("RightMargin")), aAny2 );
}
// oberen/unteren Rand setzen
@@ -1040,16 +1040,16 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
uno::Any aAny2;
aAny2 <<= (sal_Int32)nUpperSpace;
xShapePropSet->setPropertyValue(
- OUString::createFromAscii( "TopMargin" ), aAny2 );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aAny2 );
aAny2 <<= (sal_Int32)nLowerSpace;
xShapePropSet->setPropertyValue(
- OUString::createFromAscii( "BottomMargin" ), aAny2 );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aAny2 );
}
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
rFCompPropSet->getPropertySetInfo();
- OUString sPropName = OUString::createFromAscii( "BackgroundColor" );
+ OUString sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor"));
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_BACKGROUND, sal_True,
&pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1067,7 +1067,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
}
- sPropName = OUString::createFromAscii( "TextColor" );
+ sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor"));
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_COLOR, sal_True,
&pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1077,7 +1077,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString::createFromAscii( "FontHeight" );
+ sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight"));
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_FONTSIZE,
sal_True, &pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1092,31 +1092,31 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
&pItem ) )
{
const SvxFontItem *pFontItem = (SvxFontItem *)pItem;
- sPropName = OUString::createFromAscii( "FontName" );
+ sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontName"));
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp <<= OUString( pFontItem->GetFamilyName() );
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString::createFromAscii( "FontStyleName" );
+ sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontStyleName"));
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp <<= OUString( pFontItem->GetStyleName() );
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString::createFromAscii( "FontFamily" );
+ sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontFamily"));
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp <<= (sal_Int16)pFontItem->GetFamily() ;
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString::createFromAscii( "FontCharset" );
+ sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontCharset"));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list