diff options
Diffstat (limited to 'extensions/inc')
-rw-r--r-- | extensions/inc/appsettings.hxx | 4 | ||||
-rw-r--r-- | extensions/inc/pch/precompiled_extensions.cxx | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | extensions/inc/pch/precompiled_extensions.hxx | 36 | ||||
-rw-r--r-- | extensions/inc/propctrlr.hrc | 5 | ||||
-rw-r--r-- | extensions/inc/ucbhelper/ext_content.hxx | 5 |
5 files changed, 20 insertions, 32 deletions
diff --git a/extensions/inc/appsettings.hxx b/extensions/inc/appsettings.hxx index 152843af51ca..8622db0bd77e 100644 --- a/extensions/inc/appsettings.hxx +++ b/extensions/inc/appsettings.hxx @@ -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. @@ -27,9 +28,7 @@ #ifndef _APPSETTINGS_HXX #define _APPSETTINGS_HXX -#ifndef __STARDIV_UNO_UTIL_CONTAINR_HXX__ #include <stardiv/uno/util/containr.hxx> -#endif #ifdef __cplusplus extern "C" { @@ -43,3 +42,4 @@ XNameContainer* getApplicationSettings(); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/pch/precompiled_extensions.cxx b/extensions/inc/pch/precompiled_extensions.cxx index 07dbfa821f5e..9943e17e4c45 100644 --- a/extensions/inc/pch/precompiled_extensions.cxx +++ b/extensions/inc/pch/precompiled_extensions.cxx @@ -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. @@ -27,3 +28,4 @@ #include "precompiled_extensions.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx index bed9dd749349..4582abbdb282 100755..100644 --- a/extensions/inc/pch/precompiled_extensions.hxx +++ b/extensions/inc/pch/precompiled_extensions.hxx @@ -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. @@ -33,7 +34,6 @@ #include "sal/config.h" #include "sal/types.h" - #include "boost/scoped_array.hpp" #include "boost/shared_ptr.hpp" @@ -456,29 +456,23 @@ #include "cppuhelper/weakagg.hxx" #include "cppuhelper/weakref.hxx" - - #include "i18npool/mslangid.hxx" - - - #include "osl/conditn.h" +#include "osl/conditn.hxx" #include "osl/diagnose.h" #include "osl/doublecheckedlocking.h" #include "osl/file.hxx" #include "osl/getglobalmutex.hxx" #include "osl/interlck.h" #include "osl/module.h" -#include "osl/module.hxx" -#include "osl/mutex.hxx" #include "osl/nlsupport.h" +#include "osl/pipe.hxx" #include "osl/process.h" #include "osl/security.hxx" #include "osl/thread.h" #include "osl/time.h" - #include "rtl/alloc.h" #include "rtl/bootstrap.hxx" #include "rtl/byteseq.h" @@ -487,6 +481,7 @@ #include "rtl/math.hxx" #include "rtl/memory.h" #include "rtl/process.h" +#include "rtl/ref.hxx" #include "rtl/strbuf.hxx" #include "rtl/string.h" #include "rtl/string.hxx" @@ -497,13 +492,10 @@ #include "rtl/uuid.h" #include "salhelper/simplereferenceobject.hxx" +#include "salhelper/timer.hxx" #include "sane/sane.h" - - - - #include "svl/filenotation.hxx" #include "svtools/imgdef.hxx" #include "svtools/miscopt.hxx" @@ -515,15 +507,12 @@ #include "sys/stat.h" #include "sys/types.h" - #include "tools/diagnose_ex.h" - #include "typelib/typeclass.h" #include "typelib/typedescription.h" #include "typelib/typedescription.hxx" - #include "uno/dispatcher.h" #include "uno/environment.h" #include "uno/lbnames.h" @@ -532,21 +521,14 @@ #include "unotools/confignode.hxx" #include "unotools/processfactory.hxx" - #include "tools/fldunit.hxx" -#include "vos/conditn.hxx" -#include "vos/diagnose.hxx" -#include "vos/macros.hxx" -#include "vos/module.hxx" -#include "vos/mutex.hxx" -#include "vos/pipe.hxx" -#include "vos/ref.hxx" -#include "vos/refernce.hxx" -#include "vos/thread.hxx" -#include "vos/timer.hxx" +#include "osl/module.hxx" +#include "osl/mutex.hxx" #include "xmloff/nmspmap.hxx" //---MARKER--- #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index 584dc469a7f5..69cff742d9a8 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -83,7 +83,7 @@ #define UID_BRWEVT_POSITIONING "EXTENSIONS_UID_BRWEVT_POSITIONING" #define UID_BRWEVT_POSITIONED "EXTENSIONS_UID_BRWEVT_POSITIONED" #define UID_BRWEVT_APPROVEPARAMETER "EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER" -#define UID_BRWEVT_ERROROCCURED "EXTENSIONS_UID_BRWEVT_ERROROCCURED" +#define UID_BRWEVT_ERROROCCURRED "EXTENSIONS_UID_BRWEVT_ERROROCCURRED" #define UID_BRWEVT_ADJUSTMENTVALUECHANGED "EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED" #define HID_PROP_INPUT_REQUIRED "EXTENSIONS_HID_PROP_INPUT_REQUIRED" @@ -284,7 +284,7 @@ #define HID_EVT_AFTERUPDATE "EXTENSIONS_HID_EVT_AFTERUPDATE" #define HID_EVT_BEFOREUPDATE "EXTENSIONS_HID_EVT_BEFOREUPDATE" #define HID_EVT_CONFIRMDELETE "EXTENSIONS_HID_EVT_CONFIRMDELETE" -#define HID_EVT_ERROROCCURED "EXTENSIONS_HID_EVT_ERROROCCURED" +#define HID_EVT_ERROROCCURRED "EXTENSIONS_HID_EVT_ERROROCCURRED" #define HID_EVT_FOCUSGAINED "EXTENSIONS_HID_EVT_FOCUSGAINED" #define HID_EVT_FOCUSLOST "EXTENSIONS_HID_EVT_FOCUSLOST" #define HID_EVT_ITEMSTATECHANGED "EXTENSIONS_HID_EVT_ITEMSTATECHANGED" @@ -326,5 +326,6 @@ #define HID_FM_PROPDLG_TAB_GENERAL "EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL" #define HID_FM_PROPDLG_TAB_DATA "EXTENSIONS_HID_FM_PROPDLG_TAB_DATA" #define HID_FM_PROPDLG_TAB_EVT "EXTENSIONS_HID_FM_PROPDLG_TAB_EVT" +#define HID_PROP_GROUP_NAME "EXTENSIONS_HID_PROP_GROUP_NAME" #endif // EXTENSIONS_PROPCTRLR_HRC diff --git a/extensions/inc/ucbhelper/ext_content.hxx b/extensions/inc/ucbhelper/ext_content.hxx index 06075ea4598f..99736f7b764e 100644 --- a/extensions/inc/ucbhelper/ext_content.hxx +++ b/extensions/inc/ucbhelper/ext_content.hxx @@ -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. @@ -51,9 +52,10 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace std; -using namespace rtl; using namespace osl; +using ::rtl::OUString; + template <class Type> class safe_list : public osl::Mutex, public std::list< Type > {}; @@ -327,3 +329,4 @@ public: #endif // _UCBHELPER_CONTENT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |