diff options
Diffstat (limited to 'extensions')
472 files changed, 2416 insertions, 2495 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 --- 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: */ diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index ed7dde55290f..e9724ea1681c 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.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. @@ -35,9 +36,7 @@ #include <unotools/ucbhelper.hxx> #include <sfx2/filedlghelper.hxx> #include <unotools/pathoptions.hxx> -#ifndef SVTOOLS_FILENOTATION_HXX_ #include <svl/filenotation.hxx> -#endif #include <sfx2/docfilt.hxx> #include <vcl/msgbox.hxx> #include <comphelper/componentcontext.hxx> @@ -227,3 +226,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 27d6522d7df6..036b4fa543b4 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.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. @@ -90,3 +91,4 @@ namespace abp #endif // EXTENSIONS_ABP_ABPFINALPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index 1cb327f73c72..f71e1f352c33 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.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. @@ -84,3 +85,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( return xRet.get(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx index b586f045b204..2a5922ba2c0c 100644 --- a/extensions/source/abpilot/abptypes.hxx +++ b/extensions/source/abpilot/abptypes.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. @@ -46,3 +47,4 @@ namespace abp #endif // EXTENSIONS_ABP_ABPTYPES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx index 8d8fe2cd0b20..b46674355255 100644 --- a/extensions/source/abpilot/abspage.cxx +++ b/extensions/source/abpilot/abspage.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. @@ -87,3 +88,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx index 7dcba3d588c1..47c6725342f2 100644 --- a/extensions/source/abpilot/abspage.hxx +++ b/extensions/source/abpilot/abspage.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. @@ -30,9 +31,7 @@ #include <svtools/wizardmachine.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef EXTENSIONS_ABPRESID_HRC #include "abpresid.hrc" -#endif #include "componentmodule.hxx" #include <vcl/fixed.hxx> @@ -73,3 +72,4 @@ namespace abp #endif // EXTENSIONS_ABP_ABSPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 83200c373385..005c736f9f7e 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.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. @@ -115,13 +116,12 @@ namespace abp m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) ); // some initial settings +#ifdef UNX #ifdef MACOSX m_aSettings.eType = AST_MACAB; -#elif WITH_MOZILLA -#ifdef UNX - m_aSettings.eType = AST_MORK; #else - m_aSettings.eType = AST_OE; +// FIXME: if KDE use KAB instead + m_aSettings.eType = AST_EVOLUTION; #endif #else m_aSettings.eType = AST_OTHER; @@ -319,7 +319,7 @@ namespace abp case AST_EVOLUTION_GROUPWISE: case AST_EVOLUTION_LDAP : pGuess = "Personal"; break; default: - DBG_ERROR( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" ); + OSL_FAIL( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" ); return; } const ::rtl::OUString sGuess = ::rtl::OUString::createFromAscii( pGuess ); @@ -398,7 +398,7 @@ namespace abp break; case AST_INVALID: - DBG_ERROR( "OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" ); + OSL_FAIL( "OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" ); break; } m_eNewDataSourceType = m_aSettings.eType; @@ -437,7 +437,7 @@ namespace abp return new FinalPage( this ); default: - DBG_ERROR("OAddessBookSourcePilot::createPage: invalid state!"); + OSL_FAIL("OAddessBookSourcePilot::createPage: invalid state!"); return NULL; } } @@ -498,3 +498,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index c87748a49da2..a8136706d189 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.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. @@ -147,3 +148,4 @@ namespace abp #endif // EXTENSIONS_ABSPILOT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx index d35bbc61c984..6acb48022fc5 100644 --- a/extensions/source/abpilot/addresssettings.hxx +++ b/extensions/source/abpilot/addresssettings.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. @@ -77,3 +78,4 @@ namespace abp #endif // EXTENSIONS_ABP_ADDRESSSETTINGS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index a5cd96190bca..3512e99cce86 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.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. @@ -33,12 +34,8 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <vcl/stdtext.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif -#ifndef EXTENSIONS_ABPRESID_HRC #include "abpresid.hrc" -#endif #include "componentmodule.hxx" #include <vcl/waitobj.hxx> @@ -88,14 +85,14 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("Title"), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); // the name of the new data source - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InitialSelection")), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); // create the dialog Reference< XExecutableDialog > xDialog; @@ -113,7 +110,7 @@ namespace abp // context needs to be freshly created // Thus, we access the context here (within the WaitCursor), which means the user sees a waitcursor // while his/her office blocks a few seconds .... - m_xORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdbc.DriverManager" ) ); + m_xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.DriverManager" )) ); } if (xDialog.is()) @@ -126,7 +123,7 @@ namespace abp } catch(const Exception&) { - DBG_ERROR("OAdminDialogInvokation::invokeAdministration: caught an exception while executing the dialog!"); + OSL_FAIL("OAdminDialogInvokation::invokeAdministration: caught an exception while executing the dialog!"); } return sal_False; } @@ -135,3 +132,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx index a77f2a7e144c..a4fbd8910361 100644 --- a/extensions/source/abpilot/admininvokationimpl.hxx +++ b/extensions/source/abpilot/admininvokationimpl.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. @@ -68,3 +69,4 @@ namespace abp #endif // EXTENSIONS_ABP_ADMININVOKATIONIMPL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index 2e9d11430be2..3ef7fc398ab5 100644 --- a/extensions/source/abpilot/admininvokationpage.cxx +++ b/extensions/source/abpilot/admininvokationpage.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. @@ -112,3 +113,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx index 37f35396c212..377d32e9d0b1 100644 --- a/extensions/source/abpilot/admininvokationpage.hxx +++ b/extensions/source/abpilot/admininvokationpage.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. @@ -71,3 +72,4 @@ namespace abp #endif // EXTENSIONS_ABP_ADMINDIALOG_INVOKATION_PAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 178948ae0d3a..e0073cad0481 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.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. @@ -80,7 +81,7 @@ namespace abp //--------------------------------------------------------------------- static Reference< XNameAccess > lcl_getDataSourceContext( const Reference< XMultiServiceFactory >& _rxORB ) SAL_THROW (( Exception )) { - Reference< XNameAccess > xContext( _rxORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" ) ), UNO_QUERY ); + Reference< XNameAccess > xContext( _rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DatabaseContext" )) ), UNO_QUERY ); DBG_ASSERT(xContext.is(), "lcl_getDataSourceContext: could not access the data source context!"); return xContext; } @@ -135,7 +136,7 @@ namespace abp if (xNewDataSource.is()) { xNewDataSource->setPropertyValue( - ::rtl::OUString::createFromAscii( "URL" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )), makeAny( ::rtl::OUString::createFromAscii( _pInitialAsciiURL ) ) ); } @@ -144,7 +145,7 @@ namespace abp } catch(const Exception&) { - DBG_ERROR( "lcl_implCreateAndSetURL: caught an exception while creating the data source!" ); + OSL_FAIL( "lcl_implCreateAndSetURL: caught an exception while creating the data source!" ); } return aReturn; @@ -216,7 +217,7 @@ namespace abp } catch( const Exception& ) { - DBG_ERROR( "ODataSourceContext::ODataSourceContext: caught an exception!" ); + OSL_FAIL( "ODataSourceContext::ODataSourceContext: caught an exception!" ); } } @@ -356,9 +357,11 @@ namespace abp //--------------------------------------------------------------------- ODataSource& ODataSource::operator=( const ODataSource& _rSource ) { - delete m_pImpl; - m_pImpl = new ODataSourceImpl( *_rSource.m_pImpl ); - + if( this != &_rSource ) + { + delete m_pImpl; + m_pImpl = new ODataSourceImpl( *_rSource.m_pImpl ); + } return *this; } @@ -392,7 +395,7 @@ namespace abp } catch(const Exception&) { - DBG_ERROR( "ODataSource::registerDataSource: caught an exception while creating the data source!" ); + OSL_FAIL( "ODataSource::registerDataSource: caught an exception while creating the data source!" ); } } //--------------------------------------------------------------------- @@ -409,7 +412,7 @@ namespace abp } catch(const Exception&) { - DBG_ERROR( "ODataSource::registerDataSource: caught an exception while creating the data source!" ); + OSL_FAIL( "ODataSource::registerDataSource: caught an exception while creating the data source!" ); } } @@ -441,7 +444,7 @@ namespace abp } catch(const Exception&) { - DBG_ERROR( "ODataSource::remove: caught an exception while creating the data source!" ); + OSL_FAIL( "ODataSource::remove: caught an exception while creating the data source!" ); } } @@ -480,7 +483,7 @@ namespace abp m_pImpl->aTables.clear(); if ( !isConnected() ) { - DBG_ERROR( "ODataSource::getTableNames: not connected!" ); + OSL_FAIL( "ODataSource::getTableNames: not connected!" ); } else { @@ -523,7 +526,7 @@ namespace abp // ................................................................ // create the interaction handler (needed for authentication and error handling) - static ::rtl::OUString s_sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler"); + static ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); Reference< XInteractionHandler > xInteractions; try { @@ -561,7 +564,7 @@ namespace abp catch( const SQLException& e ) { aError <<= e; } catch( const Exception& ) { - DBG_ERROR( "ODataSource::connect: caught a generic exception!" ); + OSL_FAIL( "ODataSource::connect: caught a generic exception!" ); } // ................................................................ @@ -590,7 +593,7 @@ namespace abp } catch( const Exception& ) { - DBG_ERROR( "ODataSource::connect: caught an exception while trying to display the error!" ); + OSL_FAIL( "ODataSource::connect: caught an exception while trying to display the error!" ); } } @@ -635,3 +638,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 54819b9b9628..bffcb62cdf97 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.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. @@ -213,3 +214,4 @@ namespace abp #endif // EXTENSIONS_ABP_DATASOURCEHANDLING_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 93b2a55ea8bb..9c4c3b2e4bec 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.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. @@ -35,16 +36,13 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <tools/debug.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/stdtext.hxx> #include <com/sun/star/util/AliasProgrammaticPair.hpp> -#ifndef EXTENSIONS_ABPRESID_HRC #include "abpresid.hrc" -#endif #include "componentmodule.hxx" #include <unotools/confignode.hxx> +#include "sal/macros.h" //......................................................................... namespace abp @@ -63,16 +61,14 @@ namespace abp //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getDriverSettingsNodeName() { - static const ::rtl::OUString s_sDriverSettingsNodeName = - ::rtl::OUString::createFromAscii( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); + static const ::rtl::OUString s_sDriverSettingsNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" )); return s_sDriverSettingsNodeName; } //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getAddressBookNodeName() { - static const ::rtl::OUString s_sAddressBookNodeName = - ::rtl::OUString::createFromAscii( "/org.openoffice.Office.DataAccess/AddressBook" ); + static const ::rtl::OUString s_sAddressBookNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/AddressBook" )); return s_sAddressBookNodeName; } @@ -101,22 +97,22 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "ParentWindow" ), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE); // the data source to use - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "DataSource" ), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "DataSourceName" ), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSource" )), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE); // the table to use - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "Command" ), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE); // the title ::rtl::OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) ); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "Title" ), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE); // ........................................................ // create an instance of the dialog service - static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ); + static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" )); Reference< XExecutableDialog > xDialog( _rxORB->createInstanceWithArguments( s_sAdressBookFieldAssignmentServiceName, aArguments ), UNO_QUERY @@ -137,7 +133,7 @@ namespace abp #ifdef DBG_UTIL sal_Bool bSuccess = #endif - xDialogProps->getPropertyValue( ::rtl::OUString::createFromAscii( "FieldMapping" ) ) >>= aMapping; + xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FieldMapping" )) ) >>= aMapping; DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" ); // and copy it into the map @@ -152,7 +148,7 @@ namespace abp } catch(const Exception&) { - DBG_ERROR("fieldmapping::invokeDialog: caught an exception while executing the dialog!"); + OSL_FAIL("fieldmapping::invokeDialog: caught an exception while executing the dialog!"); } return sal_False; } @@ -203,17 +199,17 @@ namespace abp // access the configuration information which the driver uses for determining it's column names ::rtl::OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName(); - sDriverAliasesNodeName += ::rtl::OUString::createFromAscii( "/ColumnAliases" ); + sDriverAliasesNodeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/ColumnAliases" )); // create a config node for this OConfigurationTreeRoot aDriverFieldAliasing = OConfigurationTreeRoot::createWithServiceFactory( _rxORB, sDriverAliasesNodeName, -1, OConfigurationTreeRoot::CM_READONLY); // loop through all programmatic pairs - DBG_ASSERT( 0 == ( sizeof( pMappingProgrammatics ) / sizeof( pMappingProgrammatics[ 0 ] ) ) % 2, + DBG_ASSERT( 0 == SAL_N_ELEMENTS( pMappingProgrammatics ) % 2, "fieldmapping::defaultMapping: invalid programmatic map!" ); // number of pairs - sal_Int32 nIntersectedProgrammatics = sizeof( pMappingProgrammatics ) / sizeof( pMappingProgrammatics[ 0 ] ) / 2; + sal_Int32 nIntersectedProgrammatics = SAL_N_ELEMENTS( pMappingProgrammatics ) / 2; const sal_Char** pProgrammatic = pMappingProgrammatics; ::rtl::OUString sAddressProgrammatic; @@ -232,20 +228,20 @@ namespace abp aDriverFieldAliasing.getNodeValue( sDriverProgrammatic ) >>= sDriverUI; if ( 0 == sDriverUI.getLength() ) { - DBG_ERROR( "fieldmapping::defaultMapping: invalid driver UI column name!"); + OSL_FAIL( "fieldmapping::defaultMapping: invalid driver UI column name!"); } else _rFieldAssignment[ sAddressProgrammatic ] = sDriverUI; } else { - DBG_ERROR( "fieldmapping::defaultMapping: invalid driver programmatic name!" ); + OSL_FAIL( "fieldmapping::defaultMapping: invalid driver programmatic name!" ); } } } catch( const Exception& ) { - DBG_ERROR("fieldmapping::defaultMapping: code is assumed to throw no exceptions!"); + OSL_FAIL("fieldmapping::defaultMapping: code is assumed to throw no exceptions!"); // the config nodes we're using herein should not do this .... } } @@ -263,15 +259,15 @@ namespace abp OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithServiceFactory( _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString::createFromAscii( "Fields" ) ); + OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Fields" )) ); // loop through all existent fields Sequence< ::rtl::OUString > aExistentFields = aFields.getNodeNames(); const ::rtl::OUString* pExistentFields = aExistentFields.getConstArray(); const ::rtl::OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength(); - const ::rtl::OUString sProgrammaticNodeName = ::rtl::OUString::createFromAscii( "ProgrammaticFieldName" ); - const ::rtl::OUString sAssignedNodeName = ::rtl::OUString::createFromAscii( "AssignedFieldName" ); + const ::rtl::OUString sProgrammaticNodeName(RTL_CONSTASCII_USTRINGPARAM( "ProgrammaticFieldName" )); + const ::rtl::OUString sAssignedNodeName(RTL_CONSTASCII_USTRINGPARAM( "AssignedFieldName" )); for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields ) { @@ -340,9 +336,9 @@ namespace abp OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithServiceFactory( _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "DataSourceName" ), makeAny( _rDataSourceName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "Command" ), makeAny( _rTableName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), makeAny( _rDataSourceName ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), makeAny( _rTableName ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )), makeAny( (sal_Int32)CommandType::TABLE ) ); // commit the changes done aAddressBookSettings.commit(); @@ -359,7 +355,7 @@ namespace abp _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); // set the flag - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoPilotCompleted" )), makeAny( (sal_Bool)sal_True ) ); // commit the changes done aAddressBookSettings.commit(); @@ -373,3 +369,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx index 49029b534acf..7d8ae420bc39 100644 --- a/extensions/source/abpilot/fieldmappingimpl.hxx +++ b/extensions/source/abpilot/fieldmappingimpl.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. @@ -124,3 +125,4 @@ namespace abp #endif // EXTENSIONS_ABP_FIELDMAPPINGIMPL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index aaf2167d2dc2..5e1a6f91290e 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.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. @@ -52,7 +53,6 @@ namespace abp m_aInvokeDialog.SetClickHdl( LINK( this, FieldMappingPage, OnInvokeDialog ) ); // check the size of the InvokeDialog button - some languages are very ... gossipy here .... - // 96349 - 09.01.2002 - fs@openoffice.org sal_Int32 nTextWidth = m_aInvokeDialog.GetTextWidth( m_aInvokeDialog.GetText() ); sal_Int32 nBorderSpace = m_aInvokeDialog.LogicToPixel( Point( 4, 0 ), MAP_APPFONT ).X(); @@ -117,3 +117,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx index 0f1fe485ddc8..330c8e37c4a8 100644 --- a/extensions/source/abpilot/fieldmappingpage.hxx +++ b/extensions/source/abpilot/fieldmappingpage.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. @@ -68,3 +69,4 @@ namespace abp #endif // EXTENSIONS_ABP_FIELDMAPPINGPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk index 86bc5c68a7df..b205d9b3f2e9 100644 --- a/extensions/source/abpilot/makefile.mk +++ b/extensions/source/abpilot/makefile.mk @@ -44,21 +44,21 @@ CDEFS+=-DCOMPMOD_RESPREFIX=abp # --- Files -------------------------------------------------------- EXCEPTIONSFILES= \ - $(SLO)$/fieldmappingimpl.obj \ - $(SLO)$/datasourcehandling.obj \ + $(SLO)$/abpfinalpage.obj \ + $(SLO)$/abpservices.obj \ + $(SLO)$/abspage.obj \ + $(SLO)$/abspilot.obj \ $(SLO)$/admininvokationimpl.obj \ - $(SLO)$/unodialogabp.obj \ - $(SLO)$/moduleabp.obj \ - $(SLO)$/abpservices.obj \ + $(SLO)$/admininvokationpage.obj \ + $(SLO)$/datasourcehandling.obj \ + $(SLO)$/fieldmappingimpl.obj \ + $(SLO)$/fieldmappingpage.obj \ + $(SLO)$/moduleabp.obj \ + $(SLO)$/tableselectionpage.obj \ $(SLO)$/typeselectionpage.obj \ + $(SLO)$/unodialogabp.obj \ SLOFILES= \ - $(SLO)$/fieldmappingpage.obj \ - $(SLO)$/abpfinalpage.obj \ - $(SLO)$/tableselectionpage.obj \ - $(SLO)$/admininvokationpage.obj \ - $(SLO)$/abspage.obj \ - $(SLO)$/abspilot.obj \ $(EXCEPTIONSFILES) diff --git a/extensions/source/abpilot/moduleabp.cxx b/extensions/source/abpilot/moduleabp.cxx index 9f6d3d2b9e30..6fb06c7f68ac 100644 --- a/extensions/source/abpilot/moduleabp.cxx +++ b/extensions/source/abpilot/moduleabp.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. @@ -30,3 +31,4 @@ #include "componentmodule.cxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 869c806ea819..fa3d4cc23c7c 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.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. @@ -131,3 +132,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx index d2d878c65d5f..9a7edca449dc 100644 --- a/extensions/source/abpilot/tableselectionpage.hxx +++ b/extensions/source/abpilot/tableselectionpage.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. @@ -71,3 +72,4 @@ namespace abp #endif // EXTENSIONS_ABP_TABLESELECTIONPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index fd83630e81d9..67b360d9dc91 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.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. @@ -244,3 +245,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index 9df17bb1d77f..b78f3f036f52 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.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. @@ -104,3 +105,4 @@ namespace abp #endif // EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 46534b56d61e..5eb4b1d7681a 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.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. @@ -119,7 +120,7 @@ namespace abp //--------------------------------------------------------------------- ::rtl::OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.abp.OAddressBookSourcePilot"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.abp.OAddressBookSourcePilot")); } //--------------------------------------------------------------------- @@ -132,7 +133,7 @@ namespace abp ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.AddressBookSourcePilot"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AddressBookSourcePilot")); return aSupported; } @@ -176,7 +177,7 @@ namespace abp // (or he can start it again by using wizard-menu!) // So we should deregister it on our general job execution service by using right protocol parameters. ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1); - lProtocol[0].Name = ::rtl::OUString::createFromAscii("Deactivate"); + lProtocol[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); } @@ -194,3 +195,4 @@ namespace abp } // namespace abp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index 1953f45f7cd9..aa320b027191 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.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. @@ -99,3 +100,4 @@ namespace abp #endif // EXTENSIONS_ABP_UNODIALOG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/main/SOActionsApproval.cpp index 9a36645589bc..e0ce5c5da58e 100644 --- a/extensions/source/activex/main/SOActionsApproval.cpp +++ b/extensions/source/activex/main/SOActionsApproval.cpp @@ -1,9 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // SOActionsApproval.cpp : Implementation of CHelpApp and DLL registration. #include "stdafx2.h" #include "so_activex.h" #include "SOActionsApproval.h" +#include <sal/macros.h> ///////////////////////////////////////////////////////////////////////////// // @@ -15,7 +17,7 @@ STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) &IID_ISOActionsApproval, }; - for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++) + for (int i=0;i<SAL_N_ELEMENTS(arr);i++) { #if defined(_MSC_VER) && (_MSC_VER >= 1300) if (InlineIsEqualGUID(*arr[i],riid)) @@ -27,3 +29,4 @@ STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) return S_FALSE; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/SOActionsApproval.h b/extensions/source/activex/main/SOActionsApproval.h index d10ec1461d80..a5570312864d 100644 --- a/extensions/source/activex/main/SOActionsApproval.h +++ b/extensions/source/activex/main/SOActionsApproval.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // SOActionsApproval.h: Definition of the SOActionsApproval class // ////////////////////////////////////////////////////////////////////// @@ -79,3 +80,4 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODOCUMENTEVENTLISTENER) #endif // __SODOCUMENTEVENTLISTENER_H_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/main/SOActiveX.cpp index 52833ae17587..f95e42772185 100644 --- a/extensions/source/activex/main/SOActiveX.cpp +++ b/extensions/source/activex/main/SOActiveX.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // SOActiveX.cpp : Implementation of CSOActiveX #pragma warning (disable:4505) @@ -1149,3 +1150,4 @@ HRESULT CSOActiveX::GetURL( const OLECHAR* url, // --------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/main/SOActiveX.h index 2bf33f96b4e9..fea95d09c9b9 100644 --- a/extensions/source/activex/main/SOActiveX.h +++ b/extensions/source/activex/main/SOActiveX.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // SOActiveX.h : Declaration of the CSOActiveX #ifndef __SOACTIVEX_H_ @@ -174,3 +175,4 @@ public: #endif //__SOACTIVEX_H_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp b/extensions/source/activex/main/SOComWindowPeer.cpp index 7b9e60d8e15e..7fb56dbdfd32 100644 --- a/extensions/source/activex/main/SOComWindowPeer.cpp +++ b/extensions/source/activex/main/SOComWindowPeer.cpp @@ -1,8 +1,10 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // SOComWindowPeer.cpp : Implementation of CHelpApp and DLL registration. #include "stdafx2.h" #include "so_activex.h" #include "SOComWindowPeer.h" +#include <sal/macros.h> ///////////////////////////////////////////////////////////////////////////// // @@ -14,7 +16,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) &IID_ISOComWindowPeer, }; - for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++) + for (int i=0;i<SAL_N_ELEMENTS(arr);i++) { #if defined(_MSC_VER) && (_MSC_VER >= 1300) if (InlineIsEqualGUID(*arr[i],riid)) @@ -26,3 +28,4 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) return S_FALSE; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/SOComWindowPeer.h b/extensions/source/activex/main/SOComWindowPeer.h index 55be8cafcbb0..c819e17a81ea 100644 --- a/extensions/source/activex/main/SOComWindowPeer.h +++ b/extensions/source/activex/main/SOComWindowPeer.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // SOComWindowPeer.h: Definition of the SOComWindowPeer class // ////////////////////////////////////////////////////////////////////// @@ -131,3 +132,5 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER) }; #endif // __SOCOMWINDOWPEER_H_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp b/extensions/source/activex/main/SODispatchInterceptor.cpp index 4f8de973b45f..dcddf0d86b0c 100644 --- a/extensions/source/activex/main/SODispatchInterceptor.cpp +++ b/extensions/source/activex/main/SODispatchInterceptor.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // SODispatchInterceptor.cpp : Implementation of CHelpApp and DLL registration. #include "stdio.h" @@ -6,6 +7,7 @@ #include "SOActiveX.h" #include "SODispatchInterceptor.h" #include "com_uno_helper.h" +#include <sal/macros.h> ///////////////////////////////////////////////////////////////////////////// // @@ -17,7 +19,7 @@ STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid) &IID_ISODispatchInterceptor, }; - for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++) + for (int i=0;i<SAL_N_ELEMENTS(arr);i++) { #if defined(_MSC_VER) && (_MSC_VER >= 1300) if (InlineIsEqualGUID(*arr[i],riid)) @@ -220,3 +222,4 @@ STDMETHODIMP SODispatchInterceptor::getInterceptedURLs( SAFEARRAY FAR* FAR* pVal } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/SODispatchInterceptor.h b/extensions/source/activex/main/SODispatchInterceptor.h index 9bec765e8aab..538b12f24d2e 100644 --- a/extensions/source/activex/main/SODispatchInterceptor.h +++ b/extensions/source/activex/main/SODispatchInterceptor.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // SODispatchInterceptor.h: Definition of the SODispatchInterceptor class // ////////////////////////////////////////////////////////////////////// @@ -153,3 +154,5 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODISPATCHINTERCEPTOR) }; #endif // __SODISPATCHINTERCEPTOR_H_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/StdAfx2.cpp b/extensions/source/activex/main/StdAfx2.cpp index 9dc308f373ee..f1cf88d10d14 100644 --- a/extensions/source/activex/main/StdAfx2.cpp +++ b/extensions/source/activex/main/StdAfx2.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // stdafx1.cpp : source file that includes just the standard includes // stdafx1.pch will be the pre-compiled header // stdafx1.obj will contain the pre-compiled type information @@ -16,3 +17,5 @@ #undef _DEBUG #endif #include <atlimpl.cpp> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/StdAfx2.h b/extensions/source/activex/main/StdAfx2.h index c7e2997e0c6d..5c540b0ba329 100644 --- a/extensions/source/activex/main/StdAfx2.h +++ b/extensions/source/activex/main/StdAfx2.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // stdafx1.h : include file for standard system include files, // or project specific include files that are used frequently, // but are changed infrequently @@ -40,3 +41,5 @@ extern CComModule _Module; // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/com_uno_helper.h b/extensions/source/activex/main/com_uno_helper.h index 19be354f9bf0..230fc63a6e77 100644 --- a/extensions/source/activex/main/com_uno_helper.h +++ b/extensions/source/activex/main/com_uno_helper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include "stdafx2.h" HRESULT ExecuteFunc( IDispatch* idispUnoObject, @@ -22,3 +23,4 @@ HRESULT GetPropertiesFromIDisp( IDispatch* pdispObject, CComVariant* pVariant, unsigned int count ); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/resource.h b/extensions/source/activex/main/resource.h index 7e4be1ee24e7..fe74853c6d15 100644 --- a/extensions/source/activex/main/resource.h +++ b/extensions/source/activex/main/resource.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by so_activex.rc @@ -24,3 +25,4 @@ #endif #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp index b5793f6c7274..8618571a5a1d 100644 --- a/extensions/source/activex/main/so_activex.cpp +++ b/extensions/source/activex/main/so_activex.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // so_activex.cpp : Implementation of DLL Exports. @@ -16,8 +17,6 @@ #include <comphelper\documentconstants.hxx> -// #define MY_DEBUG 1 - CComModule _Module; BEGIN_OBJECT_MAP(ObjectMap) @@ -28,7 +27,7 @@ END_OBJECT_MAP() #define X64_LIB_NAME "so_activex_x64.dll" #define X32_LIB_NAME "so_activex.dll" -// 06.11.2009 tkr: to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY +// to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY // in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems. // Also defined in setup_native\source\win32\customactions\reg64\reg64.cxx,source\win32\customactions\shellextensions\shellextensions.cxx and // extensions\source\activex\main\so_activex.cpp @@ -50,7 +49,7 @@ const BOOL bX64 = FALSE; #define REG_DELETE_KEY_A( key, aPath, nKeyAccess ) RegDeleteKeyA( key, aPath ) #endif -// 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExA if WINVER < 0x0502. +// MinGW doesn't know anything about RegDeleteKeyExA if WINVER < 0x0502. extern "C" { WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); } @@ -210,10 +209,6 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc if ( bForAllUsers ) DllUnregisterServerNative( nMode, sal_False, sal_False ); -#ifdef MY_DEBUG - MessageBoxA(NULL, pProgramPath, "Library Path, ( from library )", MB_OK | MB_ICONINFORMATION); -#endif - if ( pProgramPath && strlen( pProgramPath ) < 1024 ) { sprintf( pActiveXPath, "%s\\%s", pProgramPath, pLibName ); @@ -688,3 +683,4 @@ STDAPI DllUnregisterServer( void ) return DllUnregisterServerNative( 63, TRUE, bX64 ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index 14c5259489fd..480a82078eb9 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -45,9 +45,8 @@ #define RID_BIB_CONTROLS (RID_BIB_START + 100) #define RID_BIB_TOOLBAR (RID_BIB_CONTROLS+ 1) #define RID_TOOLBAR_IMGLIST (RID_BIB_CONTROLS+ 2) -#define RID_TOOLBAR_IMGLIST_HC (RID_BIB_CONTROLS+ 3) +// free #define RID_TOOLBAR_BIGIMGLIST (RID_BIB_CONTROLS+ 4) -#define RID_TOOLBAR_BIGIMGLIST_HC (RID_BIB_CONTROLS+ 5) //Menu(100) #define RID_BIB_MENU (RID_BIB_CONTROLS + 100) diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index f0203607c219..cc3d26ac84e9 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.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. @@ -43,15 +44,14 @@ #include "toolbar.hrc" #include "bibresid.hxx" #include "datman.hxx" -#ifndef BIBTOOLS_HXX #include "bibtools.hxx" -#endif -using namespace rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; +using ::rtl::OUString; + #define C2U(cChar) OUString::createFromAscii(cChar) #define PROPERTY_FRAME 1 @@ -179,7 +179,6 @@ namespace bib m_xGridWin->setVisible( sal_True ); m_xControl->setDesignMode( sal_True ); // initially switch on the desing mode - switch it off _after_ loading the form - // 17.10.2001 - 93107 - frank.schoenheit@sun.com ::Size aSize = GetOutputSizePixel(); m_xGridWin->setPosSize(0, 0, aSize.Width(),aSize.Height(), awt::PosSize::POSSIZE); @@ -319,3 +318,5 @@ namespace bib //......................................................................... } // namespace bib //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 9e5ff677ee6f..68fc1fe38441 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.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. @@ -91,3 +92,5 @@ namespace bib //......................................................................... #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 16ece4dc7411..a4558d35bd01 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.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. @@ -38,14 +39,13 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -using namespace rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -/* -----------------11.11.99 14:34------------------- - --------------------------------------------------*/ +using ::rtl::OUString; + typedef Mapping* MappingPtr; SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2, 2) SV_IMPL_PTRARR(MappingArray, MappingPtr); @@ -53,9 +53,7 @@ SV_IMPL_PTRARR(MappingArray, MappingPtr); #define C2U(cChar) OUString::createFromAscii(cChar) const char* cDataSourceHistory = "DataSourceHistory"; -/* -----------------------------13.11.00 12:21-------------------------------- - ---------------------------------------------------------------------------*/ Sequence<OUString> BibConfig::GetPropertyNames() { static Sequence<OUString> aNames; @@ -74,9 +72,7 @@ Sequence<OUString> BibConfig::GetPropertyNames() } return aNames; } -/* -----------------------------13.11.00 11:00-------------------------------- - ---------------------------------------------------------------------------*/ BibConfig::BibConfig() : ConfigItem(C2U("Office.DataAccess/Bibliography"), CONFIG_MODE_DELAYED_UPDATE), pMappingsArr(new MappingArray), @@ -210,18 +206,14 @@ BibConfig::BibConfig() : } } } -/* -----------------------------13.11.00 11:00-------------------------------- - ---------------------------------------------------------------------------*/ BibConfig::~BibConfig() { if(IsModified()) Commit(); delete pMappingsArr; } -/* -----------------------------13.11.00 12:08-------------------------------- - ---------------------------------------------------------------------------*/ BibDBDescriptor BibConfig::GetBibliographyURL() { BibDBDescriptor aRet; @@ -230,9 +222,7 @@ BibDBDescriptor BibConfig::GetBibliographyURL() aRet.nCommandType = nTblOrQuery; return aRet; }; -/* -----------------------------13.11.00 12:20-------------------------------- - ---------------------------------------------------------------------------*/ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc) { sDataSource = rDesc.sDataSource; @@ -320,9 +310,7 @@ void BibConfig::Commit() } } } -/* -----------------------------13.11.00 12:23-------------------------------- - ---------------------------------------------------------------------------*/ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const { for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++) @@ -334,9 +322,7 @@ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const } return 0; } -/* -----------------------------13.11.00 12:23-------------------------------- - ---------------------------------------------------------------------------*/ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapping) { for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++) @@ -353,21 +339,15 @@ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapp pMappingsArr->Insert(pNew, pMappingsArr->Count()); SetModified(); } -/* -----------------------------20.11.00 11:56-------------------------------- - ---------------------------------------------------------------------------*/ DBChangeDialogConfig_Impl::DBChangeDialogConfig_Impl() { } -/* -----------------------------20.11.00 11:57-------------------------------- - ---------------------------------------------------------------------------*/ DBChangeDialogConfig_Impl::~DBChangeDialogConfig_Impl() { } -/* -----------------------------14.03.01 12:53-------------------------------- - ---------------------------------------------------------------------------*/ const Sequence<OUString>& DBChangeDialogConfig_Impl::GetDataSourceNames() { if(!aSourceNames.getLength()) @@ -387,3 +367,4 @@ const Sequence<OUString>& DBChangeDialogConfig_Impl::GetDataSourceNames() return aSourceNames; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index f5e18734ae0a..982430bdacdb 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.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. @@ -139,9 +140,7 @@ public: void SetShowColumnAssignmentWarning(sal_Bool bSet) { bShowColumnAssignmentWarning = bSet;} }; -/* -----------------------------20.11.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ class DBChangeDialogConfig_Impl { com::sun::star::uno::Sequence<rtl::OUString> aSourceNames; @@ -153,3 +152,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index 6309b635f386..5f8158a3e760 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.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. @@ -273,3 +274,5 @@ sal_Bool BibBookContainer::HandleShortCutKey( const KeyEvent& rKeyEvent ) return bRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index 931c4d3fb09b..872734348436 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.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. @@ -112,3 +113,5 @@ class BibBookContainer: public BibSplitWindow }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 64262d2356a9..e0d419c40d80 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.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. @@ -36,9 +37,7 @@ #include <svl/itemprop.hxx> #include <uno/environment.h> #include <svl/urihelper.hxx> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> // helper for factories #include <com/sun/star/sdbc/ResultSetType.hpp> @@ -65,9 +64,7 @@ #include <svtools/svmedit.hxx> #include "bibresid.hxx" -#ifndef BIB_HRC #include "bib.hrc" -#endif #include "bibcont.hxx" #include "bibbeam.hxx" #include "bibmod.hxx" @@ -260,7 +257,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUS { //! - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; m_pBibMod = OpenBibModul(); String aURLStr( rURL ); @@ -283,7 +280,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: const Sequence< PropertyValue >& /*rArgs*/, const Reference< XLoadEventListener > & rListener) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; //! if(!m_pBibMod) m_pBibMod = OpenBibModul(); @@ -384,9 +381,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: if ( xLayoutManager.is() ) xLayoutManager->createElement( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ))); } -/* -----------------06.12.99 14:37------------------- - --------------------------------------------------*/ BibDataManager* BibliographyLoader::GetDataManager()const { if(!m_pDatMan) @@ -398,9 +393,7 @@ BibDataManager* BibliographyLoader::GetDataManager()const } return m_pDatMan; } -/* -----------------06.12.99 14:39------------------- - --------------------------------------------------*/ Reference< XNameAccess > BibliographyLoader::GetDataColumns() const { if (!m_xColumns.is()) @@ -456,9 +449,7 @@ Reference< XNameAccess > BibliographyLoader::GetDataColumns() const return m_xColumns; } -/* -----------------17.12.99 12:29------------------- - --------------------------------------------------*/ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const { BibDataManager* pDatMan = GetDataManager(); @@ -474,9 +465,6 @@ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const return xReturn; } -/* -----------------06.12.99 15:05------------------- - - --------------------------------------------------*/ Reference< XResultSet > BibliographyLoader::GetDataCursor() const { if (!m_xCursor.is()) @@ -486,9 +474,6 @@ Reference< XResultSet > BibliographyLoader::GetDataCursor() const return m_xCursor; } -/*-- 17.11.99 12:51:38--------------------------------------------------- - - -----------------------------------------------------------------------*/ rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, const Mapping* pMapping, const String& rColumnName) { @@ -568,9 +553,7 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw } return aRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException ) { Sequence< rtl::OUString > aRet(10); @@ -605,9 +588,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt aRet.realloc(nRealNameCount); return aRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( RuntimeException ) { sal_Bool bRet = sal_False; @@ -636,16 +617,12 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti } return bRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Type BibliographyLoader::getElementType(void) throw ( RuntimeException ) { return ::getCppuType((Sequence<PropertyValue>*)0); } -/*-- 17.11.99 12:51:40--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException ) { Reference< XResultSet > xCursor = GetDataCursor(); @@ -653,9 +630,6 @@ sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException ) return xColumns.is() && (xColumns->getElementNames().getLength() != 0); } -/*-- 07.12.99 14:28:39--------------------------------------------------- - - -----------------------------------------------------------------------*/ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) throw ( RuntimeException ) { @@ -668,9 +642,7 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) thro SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo(); return xRet; } -/*-- 07.12.99 14:28:39--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, const Any& /*aValue*/) throw( UnknownPropertyException, PropertyVetoException, @@ -679,9 +651,7 @@ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, throw UnknownPropertyException(); //no changeable properties } -/*-- 07.12.99 14:28:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { @@ -736,36 +706,28 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) throw UnknownPropertyException(); return aRet; } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::addPropertyChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::removePropertyChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::addVetoableChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no vetoable properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::removeVetoableChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) @@ -775,3 +737,4 @@ void BibliographyLoader::removeVetoableChangeListener( +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 97ff0ce9cc86..a686e76bca79 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.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. @@ -111,12 +112,11 @@ STATIC_USTRING(FM_PROP_LABEL,C2U("Label")); STATIC_USTRING(FM_PROP_CONTROLSOURCE,C2U("DataField")); STATIC_USTRING(FM_PROP_NAME,C2U("Name")); STATIC_USTRING(FM_PROP_FORMATKEY,C2U("FormatKey")); -#ifdef TF_SDBAPI -#else // !TF_SDBAPI STATIC_USTRING(FM_PROP_EDITMODE,C2U("RecordMode")); STATIC_USTRING(FM_PROP_CURSORSOURCETYPE,C2U("DataSelectionType")); STATIC_USTRING(FM_PROP_CURSORSOURCE,C2U("DataSelection")); STATIC_USTRING(FM_PROP_DATASOURCE, C2U("DataSource")); -#endif // !TF_SDBAPI STATIC_USTRING(FM_PROP_VALUE,C2U("Value")); STATIC_USTRING(FM_PROP_TEXT,C2U("Text")); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx index 3e244f995607..475d67937129 100644 --- a/extensions/source/bibliography/bibmod.hxx +++ b/extensions/source/bibliography/bibmod.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. @@ -63,3 +64,5 @@ HdlBibModul OpenBibModul(); void CloseBibModul(HdlBibModul ppBibModul); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibprop.hrc b/extensions/source/bibliography/bibprop.hrc index 42767a2c01b1..694d90d6402a 100644 --- a/extensions/source/bibliography/bibprop.hrc +++ b/extensions/source/bibliography/bibprop.hrc @@ -32,13 +32,10 @@ extern rtl::OUString FM_PROP_NAME; extern rtl::OUString FM_PROP_CONTROLSOURCE; extern rtl::OUString FM_PROP_FORMATKEY; extern rtl::OUString FM_PROP_VALUE; -#ifdef TF_SDBAPI -#else // !TF_SDBAPI extern rtl::OUString FM_PROP_EDITMODE; extern rtl::OUString FM_PROP_DATASOURCE; extern rtl::OUString FM_PROP_CURSORSOURCE; extern rtl::OUString FM_PROP_CURSORSOURCETYPE; -#endif // !TF_SDBAPI extern rtl::OUString FM_PROP_TEXT; #endif // _SVX_FMPROP_HRC diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index 75b61129b96e..7c4081225f7c 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.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. @@ -42,3 +43,4 @@ class BibResId : public ResId #endif // ADRRESID_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx index 0ef8c6fcf9a2..87258e38d049 100644 --- a/extensions/source/bibliography/bibshortcuthandler.hxx +++ b/extensions/source/bibliography/bibshortcuthandler.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. @@ -85,3 +86,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx index 22b9e07faac2..f013e7514033 100644 --- a/extensions/source/bibliography/bibtools.hxx +++ b/extensions/source/bibliography/bibtools.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. @@ -48,3 +49,5 @@ namespace bib } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 76f489f17bf5..8c54464adfba 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.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. @@ -28,12 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef BIB_HRC #include "bib.hrc" -#endif #include "bibcont.hxx" #include "bibbeam.hxx" -#include "bibmod.hxx" #include "general.hxx" #include "bibview.hxx" #include "datman.hxx" @@ -115,9 +113,6 @@ namespace bib m_xGeneralPage = NULL; } - /* -----------------16.11.99 13:13------------------- - - --------------------------------------------------*/ void BibView::UpdatePages() { // TODO: @@ -169,8 +164,6 @@ namespace bib } } } - //--------------------------------------------------------------------- - //--- 19.10.01 16:55:49 ----------------------------------------------- void BibView::_loaded( const EventObject& _rEvent ) { @@ -184,17 +177,12 @@ namespace bib FormControlContainer::_loaded( _rEvent ); } - /* -----------------------------02.02.00 16:49-------------------------------- - - ---------------------------------------------------------------------------*/ IMPL_STATIC_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG ) { pThis->m_pDatMan->CreateMappingDialog( pThis ); return 0; } - /* -----------------------------13.04.00 16:12-------------------------------- - ---------------------------------------------------------------------------*/ void BibView::Resize() { if ( m_pGeneralPage ) @@ -205,9 +193,6 @@ namespace bib Window::Resize(); } - //--------------------------------------------------------------------- - //--- 18.10.01 18:52:45 ----------------------------------------------- - Reference< awt::XControlContainer > BibView::getControlContainer() { Reference< awt::XControlContainer > xReturn; @@ -230,3 +215,5 @@ namespace bib //......................................................................... } // namespace bib //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index 59c516874568..af2899ad9954 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.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. @@ -84,3 +85,4 @@ namespace bib #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 4d4092804879..b2698154fd03 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.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. @@ -62,10 +63,7 @@ #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/lstbox.hxx> @@ -77,7 +75,6 @@ #include "bibmod.hxx" #include "bibview.hxx" // #100312# --------- -#include "bibbeam.hxx" #include "bibprop.hrc" #include "toolbar.hxx" #include "toolbar.hrc" @@ -106,10 +103,6 @@ using namespace ::ucb; #define MAP_TOKEN ';' #define PAIR_TOKEN ':' - -/* -----------------17.01.00 14:38------------------- - - --------------------------------------------------*/ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) { // first get the sdb::DataSource corresponding to the url @@ -128,7 +121,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) catch(Exception eEx) { (void) eEx; // make compiler happy - DBG_ERROR("Exception caught in ODatabaseContext::getRegisteredObject()"); + OSL_FAIL("Exception caught in ODatabaseContext::getRegisteredObject()"); } } // build the connection from the data source @@ -139,19 +132,12 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) ::rtl::OUString sUser, sPwd; Reference< XPropertySet > xDataSourceProps(xDataSource, UNO_QUERY); Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY); -/* Reference< XPropertySetInfo > xInfo = xDataSourceProps.is() ? xDataSourceProps->getPropertySetInfo() : Reference< XPropertySetInfo > (); - if (xInfo.is() && xInfo->hasPropertyByName(C2U("User"))) - xDataSourceProps->getPropertyValue(C2U("User")) >>= sUser; - if (xInfo.is() && xInfo->hasPropertyByName(C2U("Password"))) - xDataSourceProps->getPropertyValue(C2U("Password"))>>= sPwd; -*/ try { Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler")); Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY); xConn = xComplConn->connectWithCompletion(xIHdl); -// xConn = xDataSource->getConnection(sUser, sPwd); } catch(SQLException&) { @@ -166,9 +152,6 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) return xConn; } -/* -----------------17.01.00 14:46------------------- - - --------------------------------------------------*/ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSet) { Reference< XConnection > xConn; @@ -187,14 +170,12 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSe catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("exception in getConnection"); + OSL_FAIL("exception in getConnection"); } return xConn; } -/* -----------------17.01.00 16:07------------------- - --------------------------------------------------*/ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) { Reference< XNameAccess > xReturn; @@ -234,7 +215,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) String sMsg(String::CreateFromAscii("::getColumns : catched an exception (")); sMsg += String(e.Message); sMsg.AppendAscii(") ..."); - DBG_ERROR( ByteString(sMsg, RTL_TEXTENCODING_ASCII_US ).GetBuffer()); + OSL_FAIL( ByteString(sMsg, RTL_TEXTENCODING_ASCII_US ).GetBuffer()); #endif } @@ -243,9 +224,6 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) return xReturn; } -/* -----------------11.11.99 15:54------------------- - - --------------------------------------------------*/ class MappingDialog_Impl : public ModalDialog { BibDataManager* pDatMan; @@ -332,9 +310,7 @@ public: void SetModified() {bModified = sal_True;} }; -/* -----------------11.11.99 16:42------------------- - --------------------------------------------------*/ sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , const ::rtl::OUString& rLogicalColumnName) { @@ -533,14 +509,10 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : } } } -/* -----------------11.11.99 16:44------------------- - --------------------------------------------------*/ MappingDialog_Impl::~MappingDialog_Impl() {} -/* -----------------15.11.99 10:38------------------- - --------------------------------------------------*/ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) { sal_uInt16 nEntryPos = pListBox->GetSelectEntryPos(); @@ -555,9 +527,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) SetModified(); return 0; } -/* -----------------12.11.99 14:50------------------- - --------------------------------------------------*/ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG) { if(bModified) @@ -588,9 +558,7 @@ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG) EndDialog(bModified ? RET_OK : RET_CANCEL); return 0; } -/* -----------------18.11.99 10:23------------------- - --------------------------------------------------*/ class DBChangeDialog_Impl : public ModalDialog { OKButton aOKBT; @@ -605,7 +573,6 @@ class DBChangeDialog_Impl : public ModalDialog BibDataManager* pDatMan; -// DECL_LINK(EndDragHdl, HeaderBar*); DECL_LINK(DoubleClickHdl, SvTabListBox*); public: DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ); @@ -614,9 +581,6 @@ public: String GetCurrentURL()const; }; -/*-- 18.11.99 10:35:20--------------------------------------------------- - - -----------------------------------------------------------------------*/ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) : ModalDialog(pParent, BibResId(RID_DLG_DBCHANGE) ), aOKBT(this, BibResId( BT_OK )), @@ -665,41 +629,22 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl"); + OSL_FAIL("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl"); } } -/* -----------------06.12.99 12:09------------------- - --------------------------------------------------*/ IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/) { EndDialog(RET_OK); return 0; } -/* -----------------18.11.99 11:17------------------- - - --------------------------------------------------*/ -/*IMPL_LINK(DBChangeDialog_Impl, EndDragHdl, HeaderBar*, pHB) -{ - long nTabs[3]; - nTabs[0] = 2;// Number of Tabs - nTabs[1] = 0; - nTabs[2] = pHB->GetItemSize( 1 ); - aSelectionLB.SetTabs( &nTabs[0], MAP_PIXEL ); - return 0; -};*/ - -/*-- 18.11.99 10:35:20--------------------------------------------------- - -----------------------------------------------------------------------*/ DBChangeDialog_Impl::~DBChangeDialog_Impl() { } -/* -----------------18.11.99 12:36------------------- - --------------------------------------------------*/ String DBChangeDialog_Impl::GetCurrentURL()const { String sRet; @@ -711,7 +656,6 @@ String DBChangeDialog_Impl::GetCurrentURL()const return sRet; } -// #100312# -------------------------------------------------------------------- // XDispatchProvider BibInterceptorHelper::BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch) { @@ -797,7 +741,6 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun: BibDataManager::BibDataManager() :BibDataManager_Base( GetMutex() ) - // #100312# -------------- ,m_pInterceptorHelper( NULL ) ,m_aLoadListeners(m_aMutex) ,pBibView( NULL ) @@ -805,9 +748,7 @@ BibDataManager::BibDataManager() { } -/* -------------------------------------------------- - --------------------------------------------------*/ BibDataManager::~BibDataManager() { Reference< XLoadable > xLoad( m_xForm, UNO_QUERY ); @@ -826,7 +767,6 @@ BibDataManager::~BibDataManager() xConnection->dispose(); m_xForm = NULL; } - // #100312# ---------------- if( m_pInterceptorHelper ) { m_pInterceptorHelper->ReleaseInterceptor(); @@ -919,19 +859,15 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("Exception in BibDataManager::InsertFields"); + OSL_FAIL("Exception in BibDataManager::InsertFields"); } } -/* -------------------------------------------------- - --------------------------------------------------*/ Reference< awt::XControlModel > BibDataManager::updateGridModel() { return updateGridModel( m_xForm ); } -/* -------------------------------------------------- - --------------------------------------------------*/ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< XForm > & xDbForm) { try @@ -945,9 +881,6 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< m_xGridModel = createGridModel( gGridName ); Reference< XNameContainer > xNameCont(xDbForm, UNO_QUERY); -// if (xNameCont->hasByName(sName)) -// xNameCont->removeByName(sName); -// xNameCont->insertByName( sName, makeAny( m_xGridModel ) ); } @@ -958,15 +891,13 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("::updateGridModel: something went wrong !"); + OSL_FAIL("::updateGridModel: something went wrong !"); } return m_xGridModel; } -/* -------------------------------------------------- - --------------------------------------------------*/ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) { Reference< XForm > xResult; @@ -1044,7 +975,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("::createDatabaseForm: something went wrong !"); + OSL_FAIL("::createDatabaseForm: something went wrong !"); } @@ -1067,7 +998,7 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources() catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("::getDataSources: something went wrong !"); + OSL_FAIL("::getDataSources: something went wrong !"); } @@ -1164,9 +1095,7 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery) } setFilter(aQueryString); } -/* -----------------03.12.99 15:05------------------- - --------------------------------------------------*/ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) { ::rtl::OUString uTable; @@ -1248,9 +1177,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) } } -/* -------------------------------------------------- - --------------------------------------------------*/ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) { ResetIdentifierMapping(); @@ -1311,7 +1238,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("::setActiveDataTable: something went wrong !"); + OSL_FAIL("::setActiveDataTable: something went wrong !"); } } @@ -1436,7 +1363,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME ); + ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME )); sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } @@ -1444,7 +1371,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("::createGridModel: something went wrong !"); + OSL_FAIL("::createGridModel: something went wrong !"); } @@ -1550,7 +1477,6 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( // (as an anologon to the XStatusListener semantics). // // But this would be way too risky for this last-day fix here. - // 97140 - 30.01.2002 - fs@openoffice.org Reference< XLoadable > xLoad( m_xForm, UNO_QUERY ); if ( xLoad.is() && xLoad->isLoaded() ) { @@ -1567,7 +1493,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("::loadControlModel: something went wrong !"); + OSL_FAIL("::loadControlModel: something went wrong !"); } return xModel; } @@ -1588,7 +1514,6 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw { try { - sal_Bool bFlag=sal_False; if(evt.PropertyName == FM_PROP_VALUE) { if( evt.NewValue.getValueType() == ::getCppuType((Reference<io::XInputStream>*)0) ) @@ -1602,13 +1527,13 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw Reference< XRowLocate > xLocate(xBibCursor, UNO_QUERY); DBG_ASSERT(xLocate.is(), "BibDataManager::propertyChange : invalid cursor !"); - bFlag = xLocate->moveToBookmark(aUID); + xLocate->moveToBookmark(aUID); } } catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("::propertyChange: something went wrong !"); + OSL_FAIL("::propertyChange: something went wrong !"); } @@ -1653,7 +1578,7 @@ try catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("Exception in BibDataManager::SetMeAsUidListener"); + OSL_FAIL("Exception in BibDataManager::SetMeAsUidListener"); } @@ -1699,29 +1624,22 @@ try catch(Exception& e ) { (void) e; // make compiler happy - DBG_ERROR("Exception in BibDataManager::RemoveMeAsUidListener"); + OSL_FAIL("Exception in BibDataManager::RemoveMeAsUidListener"); } } -/* -----------------11.11.99 15:51------------------- - --------------------------------------------------*/ void BibDataManager::CreateMappingDialog(Window* pParent) { MappingDialog_Impl* pDlg = new MappingDialog_Impl(pParent, this); if(RET_OK == pDlg->Execute() && pBibView) { reload(); -// unload(); -// pBibView->UpdatePages(); -// load(); } delete pDlg; } -/* -------------------------------------------------- - --------------------------------------------------*/ ::rtl::OUString BibDataManager::CreateDBChangeDialog(Window* pParent) { ::rtl::OUString uRet; @@ -1737,17 +1655,13 @@ void BibDataManager::CreateMappingDialog(Window* pParent) delete pDlg; return uRet; } -/*-- 18.05.2004 15:20:15--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibDataManager::DispatchDBChangeDialog() { if(pToolbar) pToolbar->SendDispatch(TBC_BT_CHANGESOURCE, Sequence< PropertyValue >()); } -/* -----------------06.12.99 15:11------------------- - --------------------------------------------------*/ const ::rtl::OUString& BibDataManager::GetIdentifierMapping() { if(!sIdentifierMapping.getLength()) @@ -1773,18 +1687,14 @@ const ::rtl::OUString& BibDataManager::GetIdentifierMapping() } return sIdentifierMapping; } -/* -----------------------------20.11.00 10:31-------------------------------- - ---------------------------------------------------------------------------*/ void BibDataManager::SetToolbar(BibToolBar* pSet) { pToolbar = pSet; if(pToolbar) pToolbar->SetDatMan(*this); } -/* -----------------------------08.05.2002 09:26------------------------------ - ---------------------------------------------------------------------------*/ uno::Reference< form::runtime::XFormController > BibDataManager::GetFormController() { if(!m_xFormCtrl.is()) @@ -1793,13 +1703,11 @@ uno::Reference< form::runtime::XFormController > BibDataManager::GetFormControll m_xFormCtrl = uno::Reference< form::runtime::XFormController > ( xMgr->createInstance(C2U("com.sun.star.form.runtime.FormController")), UNO_QUERY); m_xFormCtrl->setModel(uno::Reference< awt::XTabControllerModel > (getForm(), UNO_QUERY)); - // #100312# ------------- m_xFormDispatch = uno::Reference< frame::XDispatch > ( m_xFormCtrl, UNO_QUERY); } return m_xFormCtrl; } -// #100312# ---------- void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer) { DBG_ASSERT( !m_pInterceptorHelper, "BibDataManager::RegisterInterceptor: called twice!" ); @@ -1810,9 +1718,7 @@ void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer) m_pInterceptorHelper->acquire(); } -/*-- 18.05.2004 17:04:20--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibDataManager::HasActiveConnection()const { sal_Bool bRet = sal_False; @@ -1825,10 +1731,10 @@ sal_Bool BibDataManager::HasActiveConnection()const } return bRet; } -/*-- 04.06.2004 14:37:29--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibDataManager::HasActiveConnection() { return getConnection( m_xForm ).is(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 8360acfb62a7..7a499b785e71 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.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. @@ -197,3 +198,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx index 80ee3d2a4b08..ee45d2b58a99 100644 --- a/extensions/source/bibliography/formcontrolcontainer.cxx +++ b/extensions/source/bibliography/formcontrolcontainer.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. @@ -53,8 +54,6 @@ namespace bib { } - //--------------------------------------------------------------------- - //--- 18.10.01 18:54:57 ----------------------------------------------- FormControlContainer::~FormControlContainer( ) { DBG_ASSERT( !isFormConnected(), "FormControlContainer::~FormControlContainer: you should disconnect in your derived class!" ); @@ -62,8 +61,6 @@ namespace bib disconnectForm(); } - //--------------------------------------------------------------------- - //--- 18.10.01 17:03:14 ----------------------------------------------- void FormControlContainer::disconnectForm() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -76,8 +73,6 @@ namespace bib } } - //--------------------------------------------------------------------- - //--- 18.10.01 16:56:01 ----------------------------------------------- void FormControlContainer::connectForm( const Reference< XLoadable >& _rxForm ) { DBG_ASSERT( !isFormConnected(), "FormControlContainer::connectForm: already connected!" ); @@ -95,8 +90,6 @@ namespace bib m_xForm = _rxForm; } - //--------------------------------------------------------------------- - //--- 18.10.01 18:50:14 ----------------------------------------------- struct ControlModeSwitch : public ::std::unary_function< Reference< XControl >, void > { sal_Bool bDesign; @@ -109,8 +102,6 @@ namespace bib } }; - //--------------------------------------------------------------------- - //--- 18.10.01 18:49:57 ----------------------------------------------- void FormControlContainer::implSetDesignMode( sal_Bool _bDesign ) { try @@ -129,46 +120,34 @@ namespace bib catch( const Exception& e) { (void) e; // make compiler happy - DBG_ERROR( "FormControlContainer::implSetDesignMode: caught an exception!" ); + OSL_FAIL( "FormControlContainer::implSetDesignMode: caught an exception!" ); } } - //--------------------------------------------------------------------- - //--- 18.10.01 18:16:54 ----------------------------------------------- void FormControlContainer::ensureDesignMode() { implSetDesignMode( !m_xForm.is() || !m_xForm->isLoaded() ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:33 ----------------------------------------------- void FormControlContainer::_loaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_False ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:35 ----------------------------------------------- void FormControlContainer::_unloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_True ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:36 ----------------------------------------------- void FormControlContainer::_unloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:36 ----------------------------------------------- void FormControlContainer::_reloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_True ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:37 ----------------------------------------------- void FormControlContainer::_reloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_False ); @@ -178,3 +157,4 @@ namespace bib } // namespace bib //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx index f62ac2978574..b80b60d8bc75 100644 --- a/extensions/source/bibliography/formcontrolcontainer.hxx +++ b/extensions/source/bibliography/formcontrolcontainer.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. @@ -82,3 +83,4 @@ namespace bib #endif // EXTENSIONS_BIB_FORMCONTROLCONTAINER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index ca9996216f9b..d421ed31b7c7 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.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. @@ -30,7 +31,6 @@ #include <vcl/waitobj.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/util/URL.hpp> -#include <osl/mutex.hxx> #include <vcl/msgbox.hxx> #include <tools/debug.hxx> #include <vcl/stdtext.hxx> @@ -59,18 +59,19 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <vcl/edit.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace osl; using namespace cppu; -using namespace rtl; using namespace com::sun::star::sdbc; using namespace com::sun::star::frame; using namespace com::sun::star::uno; using namespace com::sun::star; +using ::rtl::OUString; + #define C2U(cChar) OUString::createFromAscii(cChar) struct DispatchInfo @@ -110,7 +111,7 @@ static DispatchInfo SupportedCommandsArray[] = { 0 , 0 , sal_False } }; -typedef ::std::hash_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; +typedef ::boost::unordered_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache; SV_IMPL_PTRARR( BibStatusDispatchArr, BibStatusDispatchPtr ); @@ -185,7 +186,7 @@ void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& aEvent) throw( uno:: void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + ::SolarMutexGuard aGuard; if ( pController ) pController->getFrame()->removeFrameActionListener( this ); } @@ -217,14 +218,14 @@ BibFrameController_Impl::~BibFrameController_Impl() ::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.extensions.Bibliography"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.Bibliography")); } sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) { return ( - sServiceName.equalsAscii("com.sun.star.frame.Bibliography") || - sServiceName.equalsAscii("com.sun.star.frame.Controller") + sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Bibliography")) || + sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.frame.Controller")) ); } @@ -233,7 +234,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin // return only top level services ... // base services are included there and should be asked by uno-rtti. ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Bibliography"); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography")); return lNames; } @@ -378,14 +379,11 @@ sal_Bool canInsertRecords(const Reference< beans::XPropertySet>& _rxCursorSet) _rxCursorSet->getPropertyValue(C2U("Privileges")) >>= nPriv; return ((_rxCursorSet.is() && (nPriv & sdbcx::Privilege::INSERT) != 0)); } -/* -----------------------------08.05.2002 08:58------------------------------ - ---------------------------------------------------------------------------*/ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::XFormController>& xController) { if (!xController.is()) return sal_False; - sal_Bool bInserted = sal_False; Reference< XResultSetUpdate> _xCursor = Reference< XResultSetUpdate>(xController->getModel(), UNO_QUERY); @@ -396,7 +394,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X if (!_xSet.is()) return sal_False; - // muß gespeichert werden ? + // need to save? sal_Bool bIsNew = ::comphelper::getBOOL(_xSet->getPropertyValue(C2U("IsNew"))); sal_Bool bIsModified = ::comphelper::getBOOL(_xSet->getPropertyValue(C2U("IsModified"))); sal_Bool bResult = !bIsModified; @@ -412,10 +410,8 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X } catch(Exception&) { - DBG_ERROR("SaveModified: Exception occured!"); + OSL_FAIL("SaveModified: Exception occurred!"); } - - bInserted = bIsNew && bResult; } return bResult; } @@ -440,7 +436,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen { if ( !bDisposing ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + ::SolarMutexGuard aGuard; Window* pParent = VCLUnoHelper::GetWindow( xWindow ); WaitObject aWaitObject( pParent ); @@ -468,7 +464,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } catch(const Exception&) { - DBG_ERROR("Exception catched while changing the data source"); + OSL_FAIL("Exception catched while changing the data source"); } } } @@ -512,27 +508,27 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen Sequence< Any > aDialogCreationArgs( 3 ); Any* pDialogCreationArgs = aDialogCreationArgs.getArray(); // the query composer - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "QueryComposer" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" )), -1, makeAny( pDatMan->getParser() ), beans::PropertyState_DIRECT_VALUE ); // the rowset - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "RowSet" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowSet" )), -1, makeAny( pDatMan->getForm() ), beans::PropertyState_DIRECT_VALUE ); // the parent window for the dialog - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "ParentWindow" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xWindow ), beans::PropertyState_DIRECT_VALUE ); // create the dialog object - const ::rtl::OUString sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.FilterDialog" ); + const ::rtl::OUString sDialogServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FilterDialog" )); uno::Reference< uno::XInterface > xDialog = xORB->createInstanceWithArguments( sDialogServiceName, aDialogCreationArgs @@ -558,7 +554,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } catch( const uno::Exception& ) { - DBG_ERROR( "BibFrameController_Impl::dispatch: caught an exception!" ); + OSL_FAIL( "BibFrameController_Impl::dispatch: caught an exception!" ); } sal_uInt16 nCount = aStatusListeners.Count(); @@ -602,7 +598,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } catch(Exception&) { - DBG_ERROR("Exception in last() or moveToInsertRow()"); + OSL_FAIL("Exception in last() or moveToInsertRow()"); } } } @@ -662,7 +658,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } catch(Exception&) { - DBG_ERROR("DeleteRecord : exception caught !"); + OSL_FAIL("DeleteRecord : exception caught !"); } } } @@ -749,7 +745,7 @@ void BibFrameController_Impl::addStatusListener( else if(aURL.Path == C2U("Bib/sdbsource") || aURL.Path == C2U("Bib/Mapping") || aURL.Path == C2U("Bib/autoFilter") || - aURL.Path.equalsAscii("Bib/standardFilter")) + aURL.Path.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bib/standardFilter"))) { aEvent.IsEnabled = sal_True; } @@ -975,3 +971,4 @@ void BibFrameController_Impl::deactivate() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index feadb6751cb6..5cd7e9d46471 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.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. @@ -128,3 +129,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 36e7c825a8bf..f2931d7a68cb 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.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. @@ -50,7 +51,6 @@ #include "bibtools.hxx" #include "bibliography.hrc" #include <tools/debug.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/mnemonic.hxx> @@ -93,9 +93,7 @@ OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos ) } return sRet; } -/* -----------------------------04.01.00 10:54-------------------------------- - ---------------------------------------------------------------------------*/ class BibPosListener :public cppu::WeakImplHelper1 <sdbc::XRowSetListener> { BibGeneralPage* pParentPage; @@ -111,16 +109,12 @@ public: virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException ); }; -/* -----------------------------04.01.00 10:57-------------------------------- - ---------------------------------------------------------------------------*/ BibPosListener::BibPosListener(BibGeneralPage* pParent) : pParentPage(pParent) { } -/* -----------------------------04.01.00 10:57-------------------------------- - ---------------------------------------------------------------------------*/ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno::RuntimeException ) { try @@ -190,19 +184,14 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno catch(Exception& rEx) { (void) rEx; // make compiler happy - DBG_ERROR("BibPosListener::positioned: something went wrong !"); + OSL_FAIL("BibPosListener::positioned: something went wrong !"); } } -/* -----------------------------04.01.00 11:28-------------------------------- - ---------------------------------------------------------------------------*/ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::RuntimeException ) { } -/* -----------------16.11.99 13:06------------------- - - --------------------------------------------------*/ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): BibTabPage(pParent,BibResId(RID_TP_GENERAL)), aControlParentWin(this, WB_DIALOGCONTROL), @@ -432,11 +421,9 @@ BibGeneralPage::~BibGeneralPage() xRowSet->removeRowSetListener(xPosListener); } } - /* -----------------------------14.04.00 13:11-------------------------------- - ---------------------------------------------------------------------------*/ - void BibGeneralPage::RemoveListeners() - { +void BibGeneralPage::RemoveListeners() +{ for(sal_uInt16 i = 0; i < FIELD_COUNT; i++) { if(aControls[i].is()) @@ -446,10 +433,8 @@ BibGeneralPage::~BibGeneralPage() aControls[i] = 0; } } - } -/* -----------------------------21.01.00 17:05-------------------------------- +} - ---------------------------------------------------------------------------*/ void BibGeneralPage::CommitActiveControl() { uno::Reference< form::runtime::XFormController > xFormCtrl = pDatMan->GetFormController(); @@ -574,7 +559,6 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( xCtrWin->setVisible( sal_True ); xControl->setDesignMode( sal_True ); // initially switch on the desing mode - switch it off _after_ loading the form - // 17.10.2001 - 93107 - frank.schoenheit@sun.com xCtrWin->setPosSize(rPos.X(), rPos.Y(), rSize.Width(), rSize.Height(), awt::PosSize::POSSIZE); @@ -585,7 +569,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( catch(Exception& rEx) { (void) rEx; // make compiler happy - DBG_ERROR("BibGeneralPage::AddXControl: something went wrong !"); + OSL_FAIL("BibGeneralPage::AddXControl: something went wrong !"); } return xCtrModel; } @@ -890,3 +874,5 @@ sal_Bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent ) return bHandled; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index b5519301131d..0095d18d3626 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.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. @@ -30,16 +31,11 @@ #include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XControlContainer.hpp> -//#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -//#include <com/sun/star/lang/XMultiServiceFactory.hpp> -//#endif #include <com/sun/star/form/XBoundComponent.hpp> #include <com/sun/star/sdbc/XRowSetListener.hpp> #include <svtools/stdctrl.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/group.hxx> #include <svtools/svmedit.hxx> #include <vcl/tabpage.hxx> @@ -208,3 +204,4 @@ inline BibDataManager* BibGeneralPage::GetDataManager() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx index c11eb3bed9a4..ff71292c9e7f 100644 --- a/extensions/source/bibliography/loadlisteneradapter.cxx +++ b/extensions/source/bibliography/loadlisteneradapter.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. @@ -29,7 +30,7 @@ #include "precompiled_extensions.hxx" #include "loadlisteneradapter.hxx" #include <osl/diagnose.h> -#include <vos/ref.hxx> +#include <rtl/ref.hxx> //......................................................................... namespace bib @@ -117,7 +118,7 @@ namespace bib { if ( m_bListening ) { - ::vos::ORef< OComponentAdapterBase > xPreventDelete(this); + ::rtl::Reference< OComponentAdapterBase > xPreventDelete(this); disposing(); @@ -237,3 +238,4 @@ namespace bib } // namespace bib //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx index f0a0cf1e5a3e..c37384e4d266 100644 --- a/extensions/source/bibliography/loadlisteneradapter.hxx +++ b/extensions/source/bibliography/loadlisteneradapter.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. @@ -183,3 +184,4 @@ namespace bib #endif // EXTENSIONS_BIB_LOADLISTENERADAPTER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index d320f175f0a3..f1434a0c32cd 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.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. @@ -28,7 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include <comphelper/processfactory.hxx> -#include <osl/mutex.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -36,9 +36,7 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <datman.hxx> #include <tools/debug.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svtools/miscopt.hxx> #include <svtools/imgdef.hxx> #include <vcl/svapp.hxx> @@ -47,10 +45,8 @@ #include "toolbar.hrc" #include "bibresid.hxx" -#ifndef BIBTOOLS_HXX #include "bibtools.hxx" -#endif -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace ::rtl; using namespace ::com::sun::star; @@ -77,7 +73,7 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta { if(rEvt.FeatureURL.Complete == aCommand) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; pToolBar->EnableItem(nIndex,rEvt.IsEnabled); ::com::sun::star::uno::Any aState=rEvt.State; @@ -87,14 +83,10 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta pToolBar->CheckItem(nIndex, bChecked); } - /* - rtl::OUString FeatureDescriptor; - sal_Bool Requery; - ::com::sun::star::uno::Any State;*/ } }; -rtl::OUString BibToolBarListener::GetCommand() +rtl::OUString BibToolBarListener::GetCommand() const { return aCommand; } @@ -112,7 +104,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS { if(rEvt.FeatureURL.Complete == GetCommand()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; pToolBar->EnableSourceList(rEvt.IsEnabled); Any aState = rEvt.State; @@ -152,7 +144,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) { if(rEvt.FeatureURL.Complete == GetCommand()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; pToolBar->EnableSourceList(rEvt.IsEnabled); uno::Any aState=rEvt.State; @@ -169,7 +161,6 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) sal_uInt16 nID=pToolBar->InsertFilterItem(String(pStringArray[i])); if(pStringArray[i]==rEvt.FeatureDescriptor) { -// XubString aStr = rEvt.FeatureDescriptor; pToolBar->SelectFilterItem(nID); } } @@ -190,7 +181,7 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw { if(rEvt.FeatureURL.Complete == GetCommand()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; pToolBar->EnableQuery(rEvt.IsEnabled); uno::Any aState=rEvt.State; @@ -207,9 +198,7 @@ SV_IMPL_PTRARR( BibToolBarListenerArr, BibToolBarListenerPtr); BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)), aImgLst(BibResId( RID_TOOLBAR_IMGLIST )), - aImgLstHC(BibResId(RID_TOOLBAR_IMGLIST_HC )), aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )), - aBigImgLstHC(BibResId( RID_TOOLBAR_BIGIMGLIST_HC )), aFtSource(this,WB_VCENTER), aLBSource(this,WB_DROPDOWN), aFtQuery(this,WB_VCENTER), @@ -227,7 +216,6 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): ApplyImageList(); SetStyle(GetStyle()|nStyle); SetOutStyle(TOOLBOX_STYLE_FLAT); - Size aSize=GetSizePixel(); Size a2Size(GetOutputSizePixel()); a2Size.Width()=100; aLBSource.SetSizePixel(a2Size); @@ -465,7 +453,7 @@ long BibToolBar::PreNotify( NotifyEvent& rNEvt ) long nResult=sal_True; sal_uInt16 nSwitch=rNEvt.GetType(); - if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT)// || nSwitch==EVENT_KEYUP) + if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT) { const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode(); sal_uInt16 nKey = aKeyCode.GetCode(); @@ -554,9 +542,7 @@ void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) (*pListener)->statusChanged(rEvent); } } -/* -----------------------------07.05.2002 15:08------------------------------ - ---------------------------------------------------------------------------*/ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -564,8 +550,6 @@ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) ApplyImageList(); ToolBox::DataChanged( rDCEvt ); } -/* -----------------------------07.05.2002 15:09------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ ) { @@ -617,8 +601,8 @@ void BibToolBar::RebuildToolbar() void BibToolBar::ApplyImageList() { ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? - ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) : - ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst ); + ( aImgLst ) : + ( aBigImgLst ); SetItemImage(TBC_BT_AUTOFILTER , rList.GetImage(SID_FM_AUTOFILTER)); SetItemImage(TBC_BT_FILTERCRIT , rList.GetImage(SID_FM_FILTERCRIT)); @@ -645,3 +629,5 @@ void BibToolBar::AdjustToolBox() Invalidate(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 3bb71676c007..ad6f05072309 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.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. @@ -59,7 +60,7 @@ public: BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); ~BibToolBarListener(); - rtl::OUString GetCommand(); + rtl::OUString GetCommand() const; // ::com::sun::star::lang::XEventListener // we do not hold References to dispatches, so there is nothing to do on disposal @@ -119,7 +120,6 @@ class BibToolBar: public ToolBox BibToolBarListenerArr aListenerArr; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xController; Timer aTimer; -// Timer aMenuTimer; ImageList aImgLst; ImageList aImgLstHC; ImageList aBigImgLst; @@ -187,3 +187,5 @@ class BibToolBar: public ToolBox #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src index a08fe44d04bd..a20075c8d36e 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -137,12 +137,6 @@ ImageList RID_TOOLBAR_IMGLIST MASKCOLOR BIB_IMAGES }; -ImageList RID_TOOLBAR_IMGLIST_HC -{ - Prefix = "sch"; - MASKCOLOR - BIB_IMAGES -}; ImageList RID_TOOLBAR_BIGIMGLIST { @@ -150,13 +144,6 @@ ImageList RID_TOOLBAR_BIGIMGLIST MASKCOLOR BIB_IMAGES }; -ImageList RID_TOOLBAR_BIGIMGLIST_HC -{ - Prefix = "lch"; - MASKCOLOR - BIB_IMAGES -}; - diff --git a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml index 310e80f16c44..817473af0e73 100644 --- a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml @@ -84,8 +84,7 @@ <menu:menuitem menu:id=".uno:HelpIndex"/> <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:HelpSupport"/> - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/> + <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index e76314ba56f2..5feeda7bec1f 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.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. @@ -71,3 +72,5 @@ extern "C" void *component_getFactory(const sal_Char *aImplementationName, kImplementations_entries) ; } //------------------------------------------------------------------------------ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 99312cdfde23..976b4a4bbbe6 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.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. @@ -268,7 +269,7 @@ void LdapConnection::initConnection() } else { - OSL_ENSURE( false, "LdapConnection::findUserDn-could not get DN for User "); + OSL_FAIL( "LdapConnection::findUserDn-could not get DN for User "); } return userDn ; @@ -296,20 +297,20 @@ void LdapConnection::loadModule() s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); if ( s_Ldap_Module != NULL ) { - s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_unbind_s").pData)); - s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_simple_bind_s").pData)); - s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_set_option").pData)); - s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_err2string").pData)); - s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_init").pData)); - s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_msgfree").pData)); - s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_dn").pData)); - s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_entry").pData)); - s_p_first_attribute = (t_ldap_first_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_attribute").pData)); - s_p_next_attribute = (t_ldap_next_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_next_attribute").pData)); - s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_search_s").pData)); - s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_value_free").pData)); - s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_values").pData)); - s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_memfree").pData)); + s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_unbind_s")).pData)); + s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_simple_bind_s")).pData)); + s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_set_option")).pData)); + s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_err2string")).pData)); + s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_init")).pData)); + s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_msgfree")).pData)); + s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_get_dn")).pData)); + s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_first_entry")).pData)); + s_p_first_attribute = (t_ldap_first_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_first_attribute")).pData)); + s_p_next_attribute = (t_ldap_next_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_next_attribute")).pData)); + s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_search_s")).pData)); + s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_value_free")).pData)); + s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_get_values")).pData)); + s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_memfree")).pData)); } } } @@ -317,3 +318,4 @@ void LdapConnection::loadModule() //------------------------------------------------------------------------------ } } } // extensions.config.ldap +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index b2ea7970952e..691178fd0e50 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.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. @@ -166,3 +167,5 @@ private: }} } #endif // EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 5826188c564d..0a1c3a4bec6d 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.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. @@ -36,9 +37,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/byteseq.h> -#ifndef INCLUDED_RTL_INSTANCE_HXX_ #include <rtl/instance.hxx> -#endif #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/Optional.hpp> #include <osl/security.hxx> @@ -75,7 +74,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex &aDefinition, &loggedOnUser)) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LdapUserProfileBe- LDAP not configured")), NULL); } @@ -127,7 +126,7 @@ bool LdapUserProfileBe::readLdapConfiguration( if (!xCfgProvider.is()) return false; - css::beans::NamedValue aPath(rtl::OUString::createFromAscii("nodepath"), uno::makeAny(kComponent) ); + css::beans::NamedValue aPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), uno::makeAny(kComponent) ); uno::Sequence< uno::Any > aArgs(1); aArgs[0] <<= aPath; @@ -235,7 +234,7 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( //------------------------------------------------------------------------------ rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { - return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.LdapUserProfileBe") ; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LdapUserProfileBe")); } //------------------------------------------------------------------------------ @@ -277,4 +276,4 @@ SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void) }}} // --------------------------------------------------------------------------------------- - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index f19e9e275a55..2a6cc93385cc 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.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. @@ -156,3 +157,5 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase }}} #endif // EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx index 80ae2e430dd9..4a43f1fa06ca 100644 --- a/extensions/source/config/ldap/wrapldapinclude.hxx +++ b/extensions/source/config/ldap/wrapldapinclude.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. @@ -48,3 +49,5 @@ #ifdef WNT #pragma warning (pop) #endif // WNT + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index dfadd4893cb6..692f5e96cc09 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "commonpagesdbp.hxx" -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif #include "componentmodule.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp> @@ -49,9 +48,7 @@ #include <sfx2/docfilt.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> -#ifndef SVTOOLS_FILENOTATION_HXX_ #include <svl/filenotation.hxx> -#endif //......................................................................... namespace dbp { @@ -123,7 +120,7 @@ namespace dbp try { ::rtl::OUString sDataSourceName; - rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName; + rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName; Reference< XConnection > xConnection; bool bEmbedded = ::dbtools::isEmbeddedInDatabase( rContext.xForm, xConnection ); @@ -141,9 +138,9 @@ namespace dbp implFillTables(xConnection); ::rtl::OUString sCommand; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString::createFromAscii("Command") ) >>= sCommand ); + OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")) ) >>= sCommand ); sal_Int32 nCommandType = CommandType::TABLE; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString::createFromAscii("CommandType") ) >>= nCommandType ); + OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")) ) >>= nCommandType ); // search the entry of the given type with the given name XubString sLookup( sCommand ); @@ -159,7 +156,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OTableSelectionPage::initializePage: caught an exception!"); + OSL_FAIL("OTableSelectionPage::initializePage: caught an exception!"); } } @@ -178,13 +175,13 @@ namespace dbp xOldConn = getFormConnection(); ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry(); - rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("DataSourceName"), makeAny( sDataSource ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName")), makeAny( sDataSource ) ); } ::rtl::OUString sCommand = m_aTable.GetSelectEntry(); sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("Command"), makeAny( sCommand ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("CommandType"), makeAny( nCommandType ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")), makeAny( sCommand ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")), makeAny( nCommandType ) ); if ( !rContext.bEmbedded ) setFormConnection( xOldConn, sal_False ); @@ -194,7 +191,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OTableSelectionPage::commitPage: caught an exception!"); + OSL_FAIL("OTableSelectionPage::commitPage: caught an exception!"); } return sal_True; @@ -309,7 +306,7 @@ namespace dbp } else { - DBG_ERROR("OTableSelectionPage::implFillTables: invalid data source object returned by the context"); + OSL_FAIL("OTableSelectionPage::implFillTables: invalid data source object returned by the context"); } } } @@ -318,7 +315,7 @@ namespace dbp catch(SQLException& e) { aSQLException <<= e; } catch (Exception&) { - DBG_ERROR("OTableSelectionPage::implFillTables: could not fill the table list!"); + OSL_FAIL("OTableSelectionPage::implFillTables: could not fill the table list!"); } } @@ -350,7 +347,7 @@ namespace dbp catch(SQLException& e) { aSQLException <<= e; } catch (Exception&) { - DBG_ERROR("OTableSelectionPage::implFillTables: could not fill the table list!"); + OSL_FAIL("OTableSelectionPage::implFillTables: could not fill the table list!"); } } @@ -373,9 +370,8 @@ namespace dbp { ::svt::OLocalResourceAccess aLocalResAccess( ModuleRes( RID_PAGE_TABLESELECTION ), RSC_TABPAGE ); - bool bIsHiContrast = m_aTable.GetSettings().GetStyleSettings().GetHighContrastMode(); - aTableImage = Image( ModuleRes( bIsHiContrast ? IMG_TABLE_HC : IMG_TABLE ) ); - aQueryImage = Image( ModuleRes( bIsHiContrast ? IMG_QUERY_HC : IMG_QUERY ) ); + aTableImage = Image( ModuleRes( IMG_TABLE ) ); + aQueryImage = Image( ModuleRes( IMG_QUERY ) ); } lcl_fillEntries( m_aTable, aTableNames, aTableImage, CommandType::TABLE ); lcl_fillEntries( m_aTable, aQueryNames, aQueryImage, CommandType::QUERY ); @@ -392,7 +388,7 @@ namespace dbp } catch (Exception&) { - DBG_ERROR("OTableSelectionPage::implCollectDatasource: could not collect the data source names!"); + OSL_FAIL("OTableSelectionPage::implCollectDatasource: could not collect the data source names!"); } } @@ -507,3 +503,4 @@ namespace dbp } // namespace dbp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index a20587b36d72..7dd210de79e4 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.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. @@ -144,3 +145,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_COMMONPAGESDBP_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src index c867313eac2c..f900325ec0f1 100644 --- a/extensions/source/dbpilots/commonpagesdbp.src +++ b/extensions/source/dbpilots/commonpagesdbp.src @@ -100,24 +100,11 @@ TabPage RID_PAGE_TABLESELECTION MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - Image IMG_TABLE_HC - { - ImageBitmap = Bitmap { File = "sxh03188.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; - }; - Image IMG_QUERY { ImageBitmap = Bitmap { File = "sx03202.bmp"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - - Image IMG_QUERY_HC - { - ImageBitmap = Bitmap { File = "sxh03202.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; - }; - }; TabPage RID_PAGE_OPTION_DBFIELD diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index c5d816486ecc..4097c4016565 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.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. @@ -239,13 +240,13 @@ namespace dbp sal_Int32 nCommandType = CommandType::COMMAND; try { - rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSource; - rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sCommand; - rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType; + rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSource; + rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command"))) >>= sCommand; + rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType"))) >>= nCommandType; } catch(const Exception&) { - DBG_ERROR("OControlWizardPage::initializePage: caught an exception!"); + OSL_FAIL("OControlWizardPage::initializePage: caught an exception!"); } INetURLObject aURL( sDataSource ); @@ -305,11 +306,11 @@ namespace dbp sal_Int16 nClassId = FormComponentType::CONTROL; try { - getContext().xObjectModel->getPropertyValue(::rtl::OUString::createFromAscii("ClassId")) >>= nClassId; + getContext().xObjectModel->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId"))) >>= nClassId; } catch(Exception&) { - DBG_ERROR("OControlWizard::activate: could not obtain the class id!"); + OSL_FAIL("OControlWizard::activate: could not obtain the class id!"); } if (!approveControl(nClassId)) { @@ -433,7 +434,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OControlWizard::implDeterminePage: caught an exception!"); + OSL_FAIL("OControlWizard::implDeterminePage: caught an exception!"); } } @@ -447,7 +448,7 @@ namespace dbp Reference< XInterface > xContext; if (xORB.is()) - xContext = xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdb.DatabaseContext")); + xContext = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseContext"))); DBG_ASSERT(xContext.is(), "OControlWizard::implGetDSContext: invalid database context!"); m_aContext.xDatasourceContext = Reference< XNameAccess >(xContext, UNO_QUERY); @@ -455,7 +456,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OControlWizard::implGetDSContext: invalid database context!"); + OSL_FAIL("OControlWizard::implGetDSContext: invalid database context!"); } } @@ -471,11 +472,11 @@ namespace dbp try { if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) ) - m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xConn; + m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xConn; } catch(const Exception&) { - DBG_ERROR("OControlWizard::getFormConnection: caught an exception!"); + OSL_FAIL("OControlWizard::getFormConnection: caught an exception!"); } return xConn; } @@ -501,12 +502,12 @@ namespace dbp } else { - m_aContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("ActiveConnection"), makeAny( _rxConn ) ); + m_aContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny( _rxConn ) ); } } catch(const Exception&) { - DBG_ERROR("OControlWizard::setFormConnection: caught an exception!"); + OSL_FAIL("OControlWizard::setFormConnection: caught an exception!"); } } @@ -518,7 +519,7 @@ namespace dbp //--------------------------------------------------------------------- Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const { - const ::rtl::OUString sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler"); + const ::rtl::OUString sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); Reference< XInteractionHandler > xHandler; try { @@ -571,8 +572,8 @@ namespace dbp if (m_aContext.xForm.is()) { // collect some properties of the form - ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command"))); - sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType"))); + ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")))); + sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")))); // calculate the connection the rowset is working with Reference< XConnection > xConnection; @@ -617,7 +618,7 @@ namespace dbp // not interested in any results, only in the fields Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY); - xStatementProps->setPropertyValue(::rtl::OUString::createFromAscii("MaxRows"), makeAny(sal_Int32(0))); + xStatementProps->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0))); // TODO: think about handling local SQLExceptions here ... Reference< XColumnsSupplier > xSupplyCols(xStatement->executeQuery(), UNO_QUERY); @@ -631,7 +632,7 @@ namespace dbp if (xColumns.is()) { m_aContext.aFieldNames = xColumns->getElementNames(); - static const ::rtl::OUString s_sFieldTypeProperty = ::rtl::OUString::createFromAscii("Type"); + static const ::rtl::OUString s_sFieldTypeProperty(RTL_CONSTASCII_USTRINGPARAM("Type")); const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray(); const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); for(;pBegin != pEnd;++pBegin) @@ -645,7 +646,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OControlWizard::initContext: unexpected exception while gathering column information!"); + OSL_FAIL("OControlWizard::initContext: unexpected exception while gathering column information!"); } m_aContext.aTypes.insert(OControlWizardContext::TNameTypeMap::value_type(*pBegin,nFieldType)); } @@ -656,7 +657,7 @@ namespace dbp catch(SQLException& e) { aSQLException <<= e; } catch(Exception&) { - DBG_ERROR("OControlWizard::initContext: could not retrieve the control context (caught an exception)!"); + OSL_FAIL("OControlWizard::initContext: could not retrieve the control context (caught an exception)!"); } ::comphelper::disposeComponent(xStatement); @@ -696,20 +697,20 @@ namespace dbp // the only thing we have at the moment is the label try { - ::rtl::OUString sLabelPropertyName = ::rtl::OUString::createFromAscii("Label"); + ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label")); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { ::rtl::OUString sControlLabel(_pSettings->sControlLabel); m_aContext.xObjectModel->setPropertyValue( - ::rtl::OUString::createFromAscii("Label"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), makeAny(sControlLabel) ); } } catch(Exception&) { - DBG_ERROR("OControlWizard::commitControlSettings: could not commit the basic control settings!"); + OSL_FAIL("OControlWizard::commitControlSettings: could not commit the basic control settings!"); } } @@ -723,7 +724,7 @@ namespace dbp // initialize some settings from the control model give try { - ::rtl::OUString sLabelPropertyName = ::rtl::OUString::createFromAscii("Label"); + ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label")); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { @@ -734,7 +735,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OControlWizard::initControlSettings: could not retrieve the basic control settings!"); + OSL_FAIL("OControlWizard::initControlSettings: could not retrieve the basic control settings!"); } } @@ -744,34 +745,10 @@ namespace dbp // lemme see ... return (0 == getContext().aFieldNames.getLength()); // if we got fields, the data source is valid ... -// try -// { -// // first, we need a valid data source name -// ::rtl::OUString sDataSourceName; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName; -// if (m_aContext.xDatasourceContext.is() && m_aContext.xDatasourceContext->hasByName(sDataSourceName)) -// { // at least the data source name is valid ... -// // then, a CommandType "table" would be nice ... -// sal_Int32 nCommandType = CommandType::COMMAND; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType; -// if (CommandType::TABLE == nCommandType) -// { // okay .... -// // now the table itself should be valid -// ::rtl::OUString sTableName; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sTableName; -// if (m_aContext.xObjectContainer.is() && m_aContext.xObjectContainer->hasByName(sTableName)) -// return sal_False; -// } -// } -// } -// catch(Exception&) -// { -// DBG_ERROR("OControlWizard::needDatasourceSelection: caught an exception while checking the form settings!"); -// } -// return sal_True; } //......................................................................... } // namespace dbp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 13920c5978f7..292515c46f9b 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.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. @@ -35,15 +36,11 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include "dbptypes.hxx" -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif #include "componentmodule.hxx" #include "wizardcontext.hxx" @@ -185,3 +182,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_CONTROLWIZARD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index 74b71bf35007..b285a6c92a93 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -211,9 +211,7 @@ // Image #define IMG_TABLE 1 -#define IMG_TABLE_HC 2 #define IMG_QUERY 3 -#define IMG_QUERY_HC 4 //======================================================================== // defines diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 6cb77dde19bb..0321df3984eb 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.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. @@ -89,3 +90,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx index ae9bd066b79c..47836495b585 100644 --- a/extensions/source/dbpilots/dbptools.cxx +++ b/extensions/source/dbpilots/dbptools.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. @@ -60,7 +61,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("::dbp::disambiguateName: something went (strangely) wrong!"); + OSL_FAIL("::dbp::disambiguateName: something went (strangely) wrong!"); } } @@ -68,3 +69,4 @@ namespace dbp } // namespace dbp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx index efe897d999f5..971b37fe10c9 100644 --- a/extensions/source/dbpilots/dbptools.hxx +++ b/extensions/source/dbpilots/dbptools.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. @@ -46,3 +47,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_DBPTOOLS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx index 57a871315981..ef5676f9fea9 100644 --- a/extensions/source/dbpilots/dbptypes.hxx +++ b/extensions/source/dbpilots/dbptypes.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. @@ -45,3 +46,4 @@ namespace dbp //......................................................................... #endif // _EXTENSIONS_DBP_DBPTYPES_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index c19f1d3245c0..9fddfd0635e0 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.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. @@ -110,17 +111,17 @@ namespace dbp if (!xColumnFactory.is() || !xColumnContainer.is()) return; - static const ::rtl::OUString s_sDataFieldProperty = ::rtl::OUString::createFromAscii("DataField"); - static const ::rtl::OUString s_sLabelProperty = ::rtl::OUString::createFromAscii("Label"); - static const ::rtl::OUString s_sWidthProperty = ::rtl::OUString::createFromAscii("Width"); - static const ::rtl::OUString s_sMouseWheelBehavior = ::rtl::OUString::createFromAscii("MouseWheelBehavior"); + static const ::rtl::OUString s_sDataFieldProperty (RTL_CONSTASCII_USTRINGPARAM("DataField")); + static const ::rtl::OUString s_sLabelProperty (RTL_CONSTASCII_USTRINGPARAM("Label")); + static const ::rtl::OUString s_sWidthProperty (RTL_CONSTASCII_USTRINGPARAM("Width")); + static const ::rtl::OUString s_sMouseWheelBehavior (RTL_CONSTASCII_USTRINGPARAM("MouseWheelBehavior")); static const ::rtl::OUString s_sEmptyString; // collect "descriptors" for the to-be-created (grid)columns - DECLARE_STL_VECTOR( ::rtl::OUString, StringArray ); - StringArray aColumnServiceNames; // service names to be used with the XGridColumnFactory - StringArray aColumnLabelPostfixes; // postfixes to append to the column labels - StringArray aFormFieldNames; // data field names + DECLARE_STL_VECTOR( ::rtl::OUString, OUStringArray ); + OUStringArray aColumnServiceNames; // service names to be used with the XGridColumnFactory + OUStringArray aColumnLabelPostfixes; // postfixes to append to the column labels + OUStringArray aFormFieldNames; // data field names aColumnServiceNames.reserve(getSettings().aSelectedFields.getLength()); aColumnLabelPostfixes.reserve(getSettings().aSelectedFields.getLength()); @@ -142,14 +143,14 @@ namespace dbp { case DataType::BIT: case DataType::BOOLEAN: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("CheckBox")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckBox"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TINYINT: case DataType::SMALLINT: case DataType::INTEGER: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("NumericField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumericField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; @@ -158,31 +159,31 @@ namespace dbp case DataType::DOUBLE: case DataType::NUMERIC: case DataType::DECIMAL: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("FormattedField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::DATE: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("DateField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIME: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TimeField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIMESTAMP: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("DateField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField"))); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX))); aFormFieldNames.push_back(*pSelectedFields); - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TimeField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField"))); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX))); break; default: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TextField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); } } @@ -195,10 +196,10 @@ namespace dbp { Reference< XNameAccess > xExistenceChecker(xColumnContainer.get()); - ConstStringArrayIterator pColumnServiceName = aColumnServiceNames.begin(); - ConstStringArrayIterator pColumnLabelPostfix = aColumnLabelPostfixes.begin(); - ConstStringArrayIterator pFormFieldName = aFormFieldNames.begin(); - ConstStringArrayIterator pColumnServiceNameEnd = aColumnServiceNames.end(); + ConstOUStringArrayIterator pColumnServiceName = aColumnServiceNames.begin(); + ConstOUStringArrayIterator pColumnLabelPostfix = aColumnLabelPostfixes.begin(); + ConstOUStringArrayIterator pFormFieldName = aFormFieldNames.begin(); + ConstOUStringArrayIterator pColumnServiceNameEnd = aColumnServiceNames.end(); for (;pColumnServiceName < pColumnServiceNameEnd; ++pColumnServiceName, ++pColumnLabelPostfix, ++pFormFieldName) { @@ -226,9 +227,9 @@ namespace dbp } catch(Exception&) { - DBG_ERROR( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ") - += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString("!")); + OSL_FAIL( ( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ") + += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString("!") ).getStr() ); } } } @@ -483,3 +484,4 @@ namespace dbp } // namespace dbp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index 85b91d274345..8af95be86aa0 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.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. @@ -134,3 +135,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_GRIDWIZARD_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 69d8835dcdd5..c171ed581ef3 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.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. @@ -83,9 +84,6 @@ namespace dbp { switch (_nState) { -// case GBW_STATE_DATASELECTION: -// return new OTableSelectionPage(this); -// case GBW_STATE_OPTIONLIST: return new ORadioSelectionPage(this); @@ -110,9 +108,6 @@ namespace dbp { switch (_nCurrentState) { -// case GBW_STATE_DATASELECTION: -// return GBW_STATE_OPTIONLIST; -// case GBW_STATE_OPTIONLIST: return GBW_STATE_DEFAULTOPTION; @@ -182,7 +177,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OGroupBoxWizard::createRadios: caught an exception while creating the radio shapes!"); + OSL_FAIL("OGroupBoxWizard::createRadios: caught an exception while creating the radio shapes!"); } } @@ -567,3 +562,4 @@ namespace dbp } // namespace dbp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index de0f9767f3a4..725e36e6d8e1 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.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. @@ -227,3 +228,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_GROUPBOXWIZ_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index bf3f56781d63..e313ee92049c 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.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. @@ -186,12 +187,12 @@ namespace dbp } // ListSourceType: SQL - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSourceType")), makeAny((sal_Int32)ListSourceType_SQL)); if (isListBox()) { // BoundColumn: 1 - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("BoundColumn"), makeAny((sal_Int16)1)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BoundColumn")), makeAny((sal_Int16)1)); // build the statement to set as list source String sStatement; @@ -203,7 +204,7 @@ namespace dbp sStatement += getSettings().sListContentTable; Sequence< ::rtl::OUString > aListSource(1); aListSource[0] = sStatement; - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSource"), makeAny(aListSource)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(aListSource)); } else { @@ -213,15 +214,15 @@ namespace dbp sStatement += getSettings().sListContentField; sStatement.AppendAscii(" FROM "); sStatement += getSettings().sListContentTable; - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSource"), makeAny(::rtl::OUString(sStatement))); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(::rtl::OUString(sStatement))); } // the bound field - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField))); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(getSettings().sLinkedFormField))); } catch(Exception&) { - DBG_ERROR("OListComboWizard::implApplySettings: could not set the property values for the listbox!"); + OSL_FAIL("OListComboWizard::implApplySettings: could not set the property values for the listbox!"); } } @@ -352,7 +353,7 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OContentTableSelection::initializePage: could not retrieve the table names!"); + OSL_FAIL("OContentTableSelection::initializePage: could not retrieve the table names!"); } m_aSelectTable.SelectEntry(getSettings().sListContentTable); @@ -560,3 +561,4 @@ namespace dbp } // namespace dbp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 05f7f70ea65d..67e32b50ba88 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.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. @@ -225,3 +226,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_LISTCOMBOWIZARD_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/moduledbp.cxx b/extensions/source/dbpilots/moduledbp.cxx index 9f6d3d2b9e30..6fb06c7f68ac 100644 --- a/extensions/source/dbpilots/moduledbp.cxx +++ b/extensions/source/dbpilots/moduledbp.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. @@ -30,3 +31,4 @@ #include "componentmodule.cxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index c4288a645217..9db495891604 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.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. @@ -77,14 +78,14 @@ namespace dbp Reference< XShapes > xPageShapes(_rContext.xDrawPage, UNO_QUERY); if (!xPageShapes.is()) { - DBG_ERROR("OOptionGroupLayouter::OOptionGroupLayouter: missing the XShapes interface for the page!"); + OSL_FAIL("OOptionGroupLayouter::OOptionGroupLayouter: missing the XShapes interface for the page!"); return; } Reference< XMultiServiceFactory > xDocFactory(_rContext.xDocumentModel, UNO_QUERY); if (!xDocFactory.is()) { - DBG_ERROR("OOptionGroupLayouter::OOptionGroupLayouter: no document service factory!"); + OSL_FAIL("OOptionGroupLayouter::OOptionGroupLayouter: no document service factory!"); return; } @@ -108,7 +109,7 @@ namespace dbp // shape collection (for grouping the shapes) Reference< XShapes > xButtonCollection(m_xORB->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeCollection")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection"))), UNO_QUERY); // first member : the shape of the control xButtonCollection->add(_rContext.xObjectShape.get()); @@ -123,7 +124,7 @@ namespace dbp ::com::sun::star::awt::Point aButtonPosition; aButtonPosition.X = aShapePosition.X + OFFSET; - ::rtl::OUString sElementsName = ::rtl::OUString::createFromAscii("RadioGroup"); + ::rtl::OUString sElementsName(RTL_CONSTASCII_USTRINGPARAM("RadioGroup")); disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName); StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin(); @@ -133,28 +134,28 @@ namespace dbp aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight + nTopSpace; Reference< XPropertySet > xRadioModel( - xDocFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton")), + xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.RadioButton"))), UNO_QUERY); // the label - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("Label"), makeAny(rtl::OUString(*aLabelIter))); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), makeAny(rtl::OUString(*aLabelIter))); // the value - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("RefValue"), makeAny(rtl::OUString(*aValueIter))); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")), makeAny(rtl::OUString(*aValueIter))); // default selection if (_rSettings.sDefaultField == *aLabelIter) - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("DefaultState"), makeAny(sal_Int16(1))); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")), makeAny(sal_Int16(1))); // the connection to the database field if (0 != _rSettings.sDBField.Len()) - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(_rSettings.sDBField))); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(_rSettings.sDBField))); // the name for the model - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("Name"), makeAny(sElementsName)); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName)); // create a shape for the radio button Reference< XControlShape > xRadioShape( - xDocFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.drawing.ControlShape")), + xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))), UNO_QUERY); Reference< XPropertySet > xShapeProperties(xRadioShape, UNO_QUERY); @@ -169,7 +170,7 @@ namespace dbp // the name of the shape if (xShapeProperties.is()) - xShapeProperties->setPropertyValue(::rtl::OUString::createFromAscii("Name"), makeAny(sElementsName)); + xShapeProperties->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName)); // add to the page xPageShapes->add(xRadioShape.get()); @@ -178,7 +179,7 @@ namespace dbp // set the GroupBox as "LabelControl" for the RadioButton // (_after_ having inserted the model into the page!) - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("LabelControl"), makeAny(_rContext.xObjectModel)); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")), makeAny(_rContext.xObjectModel)); } // group the shapes @@ -195,14 +196,14 @@ namespace dbp } catch(Exception&) { - DBG_ERROR("OOptionGroupLayouter::doLayout: caught an exception while grouping the shapes!"); + OSL_FAIL("OOptionGroupLayouter::doLayout: caught an exception while grouping the shapes!"); } } //--------------------------------------------------------------------- void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps) { - static const ::rtl::OUString s_sAnchorPropertyName = ::rtl::OUString::createFromAscii("AnchorType"); + static const ::rtl::OUString s_sAnchorPropertyName(RTL_CONSTASCII_USTRINGPARAM("AnchorType")); Reference< XPropertySetInfo > xPropertyInfo; if (_rxShapeProps.is()) xPropertyInfo = _rxShapeProps->getPropertySetInfo(); @@ -214,3 +215,4 @@ namespace dbp } // namespace dbp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx index ddc23a5e199c..0d38149146a5 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.hxx +++ b/extensions/source/dbpilots/optiongrouplayouter.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. @@ -73,3 +74,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_OPTIONGROUPLAYOUTER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 1ed89d280a6c..b55d9ae34b7d 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.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. @@ -104,3 +105,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index 0e3a953bcad1..cb1c5e13aa06 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -28,14 +28,9 @@ // no include protecttion // this file is included from unoautopilot.hxx directly -//using namespace ::com::sun::star::uno; -//using namespace ::com::sun::star::lang; -//using namespace ::com::sun::star::beans; -// //===================================================================== //= OUnoAutoPilot //===================================================================== -//--------------------------------------------------------------------- template <class TYPE, class SERVICEINFO> OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) :OUnoAutoPilot_Base(_rxORB) diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx index d79f4bec0890..07d8fb0920c2 100644 --- a/extensions/source/dbpilots/wizardcontext.hxx +++ b/extensions/source/dbpilots/wizardcontext.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. @@ -90,3 +91,4 @@ namespace dbp #endif // _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index 36af518fc44f..d6ac0d4765c3 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef _EXTENSIONS_DBP_WIZARDSERVICES_HXX_ #include "wizardservices.hxx" -#endif #include "unoautopilot.hxx" #include "groupboxwiz.hxx" #include "listcombowizard.hxx" @@ -71,14 +70,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OGroupBoxSI::getImplementationName() const { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OGroupBoxWizard"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGroupBoxWizard")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OGroupBoxSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GroupBoxAutoPilot"); + aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupBoxAutoPilot")); return aReturn; } @@ -88,14 +87,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OListComboSI::getImplementationName() const { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OListComboWizard"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OListComboWizard")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OListComboSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ListComboBoxAutoPilot"); + aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ListComboBoxAutoPilot")); return aReturn; } @@ -105,14 +104,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OGridSI::getImplementationName() const { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OGridWizard"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGridWizard")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OGridSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GridControlAutoPilot"); + aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GridControlAutoPilot")); return aReturn; } @@ -120,3 +119,4 @@ namespace dbp } // namespace dbp //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx index a9bf9a72b478..23f71d2722cc 100644 --- a/extensions/source/dbpilots/wizardservices.hxx +++ b/extensions/source/dbpilots/wizardservices.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. @@ -78,3 +79,4 @@ namespace dbp #endif // _EXTENSIONS_DBW_WIZARDSERVICES_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index f72458b01ec2..407d2a257966 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.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,9 +28,7 @@ #include "componentmodule.hxx" #include <tools/resmgr.hxx> -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <comphelper/sequence.hxx> #include <tools/debug.hxx> @@ -204,7 +203,7 @@ namespace COMPMOD_NAMESPACE { if (!s_pImplementationNames) { - OSL_ASSERT("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?"); + OSL_FAIL("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?"); return; } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, @@ -247,7 +246,7 @@ namespace COMPMOD_NAMESPACE if (!s_pImplementationNames) { - OSL_ASSERT("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?"); + OSL_FAIL("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?"); return NULL; } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, @@ -291,3 +290,4 @@ namespace COMPMOD_NAMESPACE } // namespace COMPMOD_NAMESPACE //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 70c416ac8d51..7625ca26e810 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.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. @@ -261,3 +262,4 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService #endif // _EXTENSIONS_COMPONENT_MODULE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index 36e3fbb0c21d..6f0a6b4969da 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.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. @@ -249,9 +250,9 @@ namespace logging return sal_False; if ( _rRecord.Level >= m_nThreshold ) - fprintf( stderr, sEntry.getStr() ); + fprintf( stderr, "%s\n", sEntry.getStr() ); else - fprintf( stdout, sEntry.getStr() ); + fprintf( stdout, "%s\n", sEntry.getStr() ); return sal_True; } @@ -340,3 +341,5 @@ namespace logging //........................................................................ } // namespace logging //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 5e02e5f7cb69..275d6938217b 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.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. * @@ -33,18 +34,10 @@ #include <string> /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LOGGING_XLOGFORMATTER_HPP_ #include <com/sun/star/logging/XCsvLogFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_LOGGING_XLOGFORMATTER_HPP_ #include <com/sun/star/logging/XLogFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif /** === end UNO includes === **/ #include <comphelper/componentcontext.hxx> @@ -380,3 +373,5 @@ namespace logging static OAutoRegistration< CsvFormatter > aAutoRegistration; } } // namespace logging + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index be233898c2ab..8aef979c00c1 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.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. @@ -207,7 +208,7 @@ namespace logging sMessage.append( ::rtl::OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) ); sMessage.append( "\nerror code: " ); sMessage.append( (sal_Int32)res ); - OSL_ENSURE( false, sMessage.makeStringAndClear() ); + OSL_FAIL( sMessage.makeStringAndClear() ); } #endif if ( m_eFileValidity == eValid ) @@ -439,3 +440,5 @@ namespace logging //........................................................................ } // namespace logging //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/log_module.cxx b/extensions/source/logging/log_module.cxx index dc5f52d8df3f..c6b2eb677c0d 100644 --- a/extensions/source/logging/log_module.cxx +++ b/extensions/source/logging/log_module.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. @@ -41,3 +42,4 @@ namespace logging } // namespace logging //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/log_module.hxx b/extensions/source/logging/log_module.hxx index fcb5732937df..dfee11365350 100644 --- a/extensions/source/logging/log_module.hxx +++ b/extensions/source/logging/log_module.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. @@ -43,3 +44,4 @@ namespace logging #endif // EXTENSIONS_LOG_MODULE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx index 421302a5a54b..1b3e0e842706 100644 --- a/extensions/source/logging/log_services.cxx +++ b/extensions/source/logging/log_services.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. @@ -46,19 +47,12 @@ namespace logging static void initializeModule() { - static bool bInitialized( false ); - if ( !bInitialized ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !bInitialized ) - { - createRegistryInfo_LoggerPool(); - createRegistryInfo_FileHandler(); - createRegistryInfo_ConsoleHandler(); - createRegistryInfo_PlainTextFormatter(); - createRegistryInfo_CsvFormatter(); - } - } + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); + createRegistryInfo_LoggerPool(); + createRegistryInfo_FileHandler(); + createRegistryInfo_ConsoleHandler(); + createRegistryInfo_PlainTextFormatter(); + createRegistryInfo_CsvFormatter(); } //........................................................................ @@ -67,3 +61,4 @@ namespace logging IMPLEMENT_COMPONENT_LIBRARY_API( ::logging::LogModule, ::logging::initializeModule ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index 747225937356..0f20d88753e0 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.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. @@ -402,3 +403,4 @@ namespace logging } // namespace logging //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 949d236d6b67..a8d216162677 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.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. @@ -50,6 +51,7 @@ #include <cppuhelper/component_context.hxx> #include <vector> +#include <sal/macros.h> //........................................................................ namespace logging @@ -113,7 +115,7 @@ namespace logging Variable( RTL_CONSTASCII_USTRINGPARAM( "$(loggername)" ), sLoggerName ) }; - for ( size_t i = 0; i < sizeof( aVariables ) / sizeof( aVariables[0] ); ++i ) + for ( size_t i = 0; i < SAL_N_ELEMENTS( aVariables ); ++i ) { ::rtl::OUString sPattern( aVariables[i].pVariablePattern, aVariables[i].nPatternLength, aVariables[i].eEncoding ); sal_Int32 nVariableIndex = _inout_rFileURL.indexOf( sPattern ); @@ -132,7 +134,7 @@ namespace logging //---------------------------------------------------------------- void lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const ::rtl::OUString& _rSettingName, Any& _inout_rSettingValue ) { - if ( !_rSettingName.equalsAscii( "FileURL" ) ) + if ( !_rSettingName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileURL" ) ) ) // not interested in this setting return; @@ -281,3 +283,5 @@ namespace logging //........................................................................ } // namespace logging //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/loggerconfig.hxx b/extensions/source/logging/loggerconfig.hxx index 1d35cd13d84c..eb41a6e12f78 100644 --- a/extensions/source/logging/loggerconfig.hxx +++ b/extensions/source/logging/loggerconfig.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. @@ -63,3 +64,5 @@ namespace logging //........................................................................ #endif // EXTENSIONS_LOGGERCONFIG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 082057741420..796cdd114192 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef EXTENSIONS_LOGHANDLER_HXX #include "loghandler.hxx" -#endif /** === begin UNO includes === **/ #include <com/sun/star/logging/LogLevel.hpp> @@ -202,3 +201,4 @@ namespace logging } // namespace logging //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx index 3927a0008f08..194435c8b1af 100644 --- a/extensions/source/logging/loghandler.hxx +++ b/extensions/source/logging/loghandler.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. @@ -122,13 +123,13 @@ namespace logging /** retrieves our formatter's heading, encoded with our encoding - @return <TRUE/> in case of success, <FALSE/> if any error occured + @return <TRUE/> in case of success, <FALSE/> if any error occurred */ bool getEncodedHead( ::rtl::OString& _out_rHead ) const; /** retrieves our formatter's tail, encoded with our encoding - @return <TRUE/> in case of success, <FALSE/> if any error occured + @return <TRUE/> in case of success, <FALSE/> if any error occurred */ bool getEncodedTail( ::rtl::OString& _out_rTail ) const; @@ -152,3 +153,5 @@ namespace logging //........................................................................ #endif // LOGHANDLER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx index cac9fe79e459..bbab43afe117 100644 --- a/extensions/source/logging/logrecord.cxx +++ b/extensions/source/logging/logrecord.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. @@ -101,3 +102,4 @@ namespace logging } // namespace logging //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx index 6503e5c48de7..5e741df5788d 100644 --- a/extensions/source/logging/logrecord.hxx +++ b/extensions/source/logging/logrecord.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. @@ -66,3 +67,5 @@ namespace logging //........................................................................ #endif // LOGRECORD_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/methodguard.hxx b/extensions/source/logging/methodguard.hxx index 2b7a209a9bdf..5067cf5425ea 100644 --- a/extensions/source/logging/methodguard.hxx +++ b/extensions/source/logging/methodguard.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. @@ -71,3 +72,4 @@ namespace logging #endif // EXTENSIONS_METHODGUARD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index fd0c96e2da8e..3ea85f415b7c 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.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. @@ -224,3 +225,5 @@ namespace logging //........................................................................ } // namespace logging //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.h b/extensions/source/macosx/spotlight/OOoContentDataParser.h index d326aa442550..537a1b2e49ed 100644 --- a/extensions/source/macosx/spotlight/OOoContentDataParser.h +++ b/extensions/source/macosx/spotlight/OOoContentDataParser.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. @@ -56,3 +57,5 @@ - (void)parserDidEndDocument:(NSXMLParser *)parser; @end + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m index 11c3ec06cfc5..f48560747f6e 100644 --- a/extensions/source/macosx/spotlight/OOoContentDataParser.m +++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m @@ -110,7 +110,7 @@ - (void)parser:(NSXMLParser *)parser parseErrorOccurred:(NSError *)parseError { //NSLog(@"parsing finished with error"); - NSLog([NSString stringWithFormat:@"An error occured parsing the document. (Error %i, Description: %@, Line: %i, Column: %i)", [parseError code], + NSLog([NSString stringWithFormat:@"An error occurred parsing the document. (Error %i, Description: %@, Line: %i, Column: %i)", [parseError code], [[parser parserError] localizedDescription], [parser lineNumber], [parser columnNumber]]); diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.h b/extensions/source/macosx/spotlight/OOoMetaDataParser.h index 7b7b97ccfd49..d22e10f128a2 100644 --- a/extensions/source/macosx/spotlight/OOoMetaDataParser.h +++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.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. @@ -50,3 +51,5 @@ - (void)parser:(NSXMLParser *)parser parseErrorOccurred:(NSError *)parseError; @end + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.h b/extensions/source/macosx/spotlight/OOoSpotlightImporter.h index e63360c57b01..78493590b177 100644 --- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.h +++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.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. @@ -40,3 +41,5 @@ - (NSData*)contentDataFileFromZip:(unzFile)unzipFile; @end + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/macosx/spotlight/ioapi.h b/extensions/source/macosx/spotlight/ioapi.h index d4cfe641de24..3bfb93d551e2 100644 --- a/extensions/source/macosx/spotlight/ioapi.h +++ b/extensions/source/macosx/spotlight/ioapi.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. @@ -96,3 +97,4 @@ void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/macosx/spotlight/unzip.h b/extensions/source/macosx/spotlight/unzip.h index 51119502b0fa..a513d0dcd37f 100644 --- a/extensions/source/macosx/spotlight/unzip.h +++ b/extensions/source/macosx/spotlight/unzip.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. @@ -375,3 +376,5 @@ extern int ZEXPORT unzSetOffset (unzFile file, uLong pos); #endif #endif /* _unz_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk index 5a0870b47194..aac2a4838e5f 100644 --- a/extensions/source/nsplugin/source/makefile.mk +++ b/extensions/source/nsplugin/source/makefile.mk @@ -49,7 +49,8 @@ dummy: @echo GTK disabled - nothing to build .ELSE # "$(ENABLE_GTK)"=="" -.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" +.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \ + "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY" INC+= -DNP_LINUX .ENDIF PKGCONFIG_MODULES=gtk+-2.0 @@ -72,9 +73,6 @@ SHL1OBJS= $(SLO)$/npshell.obj \ .IF "$(GUI)"=="UNX" STDLIBS+=$(SOLARLIBDIR)$/npunix.o SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o -#.IF "$(OS)"!="FREEBSD" -#SHL1STDLIBS+= -ldl -lnsl -#.ENDIF #FREEBSD .ENDIF #UNX .IF "$(GUI)"=="WNT" SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-obj.obj diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index 94edb1b0e48c..d009774aeb25 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.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. @@ -78,7 +79,7 @@ //https://bugzilla.mozilla.org/show_bug.cgi?id=241262 #ifdef UNIX # ifndef _UINT32 -# if defined(__alpha) || defined(__LP64__) +# if defined(__alpha) || defined(__LP64__) || defined(AIX) typedef unsigned int uint32; # else /* __alpha */ typedef unsigned long uint32; @@ -86,7 +87,7 @@ # define _UINT32 # endif # ifndef _INT32 -# if defined(__alpha) || defined(__LP64__) +# if defined(__alpha) || defined(__LP64__) || defined(AIX) typedef int int32; # else /* __alpha */ typedef long int32; @@ -928,3 +929,5 @@ NPP_Print(NPP instance, NPPrint* printInfo) } }// end of extern "C" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/npshell.hxx b/extensions/source/nsplugin/source/npshell.hxx index 2f9cfb5bf4d1..8af8bc687535 100644 --- a/extensions/source/nsplugin/source/npshell.hxx +++ b/extensions/source/nsplugin/source/npshell.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. @@ -89,3 +90,5 @@ typedef struct _PluginInstance /* Extern functions */ extern "C" NPMIMEType dupMimeType(NPMIMEType type); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/ns_debug.hxx b/extensions/source/nsplugin/source/ns_debug.hxx index e1782c5da5e7..83dc5a695534 100644 --- a/extensions/source/nsplugin/source/ns_debug.hxx +++ b/extensions/source/nsplugin/source/ns_debug.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. @@ -38,3 +39,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/nsp_func.hxx b/extensions/source/nsplugin/source/nsp_func.hxx index e132235ec4b6..566236a24ad3 100644 --- a/extensions/source/nsplugin/source/nsp_func.hxx +++ b/extensions/source/nsplugin/source/nsp_func.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. @@ -101,3 +102,5 @@ SECURITY_ATTRIBUTES NSP_pipe_access = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE #endif //end of __NSP_FUNC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/nsp_windows.cxx b/extensions/source/nsplugin/source/nsp_windows.cxx index 58a56b7c82e5..fe9060d134b1 100644 --- a/extensions/source/nsplugin/source/nsp_windows.cxx +++ b/extensions/source/nsplugin/source/nsp_windows.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. @@ -61,3 +62,5 @@ int NSP_RestoreWinStyl(long hParent, long dOldStyle) #endif return ret; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/nsp_windows.hxx b/extensions/source/nsplugin/source/nsp_windows.hxx index 707bb8bf515d..1a2d49711973 100644 --- a/extensions/source/nsplugin/source/nsp_windows.hxx +++ b/extensions/source/nsplugin/source/nsp_windows.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. @@ -34,3 +35,4 @@ int NSP_RestoreWinStyl(long hParent, long dOldStyle); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index 42a2a642e023..9d30de3918a1 100644 --- a/extensions/source/nsplugin/source/nsplugin_oo.rc +++ b/extensions/source/nsplugin/source/nsplugin_oo.rc @@ -26,5 +26,5 @@ ************************************************************************/ #define ADDITIONAL_VERINFO1 value "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\ value "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0" -#define ADDITIONAL_VERINFO2 value "FileDescription", "OpenOffice.org Plug-in handles all its documents" value "ProductName", "OpenOffice.org Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" +#define ADDITIONAL_VERINFO2 value "FileDescription", "LibreOffice Plug-in handles all its documents" value "ProductName", "LibreOffice Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" #define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0" diff --git a/extensions/source/nsplugin/source/so_closelistener.cxx b/extensions/source/nsplugin/source/so_closelistener.cxx index 8836b9f3dc17..3b99747b104b 100644 --- a/extensions/source/nsplugin/source/so_closelistener.cxx +++ b/extensions/source/nsplugin/source/so_closelistener.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. @@ -46,3 +47,4 @@ void SAL_CALL PluginDocumentClosePreventer::disposing( const lang::EventObject& {} +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/so_closelistener.hxx b/extensions/source/nsplugin/source/so_closelistener.hxx index 7ce20c9eaaf6..733381544399 100644 --- a/extensions/source/nsplugin/source/so_closelistener.hxx +++ b/extensions/source/nsplugin/source/so_closelistener.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. @@ -52,3 +53,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index f4eb2ef42169..bf782a74933f 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.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. @@ -204,9 +205,9 @@ int nspluginOOoModuleHook (void** aResult) strcpy (realFileName, libFileName); } - #if OSL_DEBUG_LEVEL > 1 - fprintf (stderr, "OpenOffice path before fixup is '%s'\n", realFileName); - #endif +#if OSL_DEBUG_LEVEL > 0 + fprintf (stderr, "LibreOffice path before fixup is '%s'\n", realFileName); +#endif if (realFileName[0] != '/') { /* a relative sym-link and we need to get an absolute path */ @@ -225,9 +226,9 @@ int nspluginOOoModuleHook (void** aResult) *aResult = realFileName; - #if OSL_DEBUG_LEVEL > 1 - fprintf (stderr, "OpenOffice path is '%s'\n", realFileName); - #endif +#if OSL_DEBUG_LEVEL > 0 + fprintf (stderr, "LibreOffice path is '%s'\n", realFileName); +#endif return 0; } @@ -505,3 +506,4 @@ void NSP_WriteLog(int level, const char* pFormat, ...) #endif } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/so_env.hxx b/extensions/source/nsplugin/source/so_env.hxx index 0cf1194c2dc2..5da85f23c467 100644 --- a/extensions/source/nsplugin/source/so_env.hxx +++ b/extensions/source/nsplugin/source/so_env.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. @@ -92,3 +93,5 @@ char* NSP_getPluginName(); char* NSP_getPluginDesc(); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index 4b1e41f724bd..658d73a59180 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.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. @@ -63,13 +64,14 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::connection; using namespace cppu; -using namespace rtl; using namespace com::sun::star; +using ::rtl::OUString; +using ::rtl::OString; + char SoPluginInstance::sSO_Dir[] = {0}; Reference< XMultiServiceFactory > SoPluginInstance::mxRemoteMSF = Reference< XMultiServiceFactory >(NULL); - SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory > xMSF): m_xUnoWin(NULL), m_xComponent(NULL), @@ -85,7 +87,6 @@ SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory m_nY = 0; m_nFlag = 15; m_bInit = sal_False; - m_sURL = rtl::OUString::createFromAscii(""); m_hParent = 0; m_pParent = pParent; m_dParentStyl = 0; @@ -135,7 +136,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) { // try to create netscape plugin window Reference< awt::XToolkit > xToolkit( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ), uno::UNO_QUERY ); if( !xToolkit.is() ) { @@ -188,7 +189,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame m_xFrame = Reference< frame::XFrame >( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Frame") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame") )), uno::UNO_QUERY ); if (!m_xFrame.is()) { @@ -204,16 +205,16 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // currently ignore errors in this code uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xLMProps; - xFrameProps->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") ) >>= xLMProps; + xFrameProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLMProps; if ( xLMProps.is() ) - xLMProps->setPropertyValue( ::rtl::OUString::createFromAscii("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); + xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")), uno::makeAny( (sal_Bool)sal_False ) ); } catch( uno::Exception& ) {} // get frames supplier Reference< frame::XFramesSupplier > m_xFramesSupplier( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY ); if ( !m_xFramesSupplier.is() ) { @@ -242,7 +243,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) //create stream for the document Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccessw")) ), uno::UNO_QUERY ); if(!xSimpleFileAccess.is()) { @@ -274,14 +275,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) ::rtl::OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ), m_sURL.getLength() ); - // load document -/* - m_xComponent = xLoader->loadComponentFromURL( - OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")), //m_sURL, - m_xFrame->getName(), 0, setPropValues ); - */ - Sequence< ::com::sun::star::beans::PropertyValue > setPropValues2(3); setPropValues2[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") ); setPropValues2[0].Value <<= sal_True; @@ -315,7 +309,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame::XDispatchHelper and frame::XDispatchProvider m_xDispatcher = Reference< frame::XDispatchHelper > ( - mxRemoteMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")), + mxRemoteMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))), uno::UNO_QUERY ); if(!m_xDispatcher.is()) { @@ -334,7 +328,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) propertyValue[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FunctionBarVisible") ); propertyValue[0].Value <<= sal_True; m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString::createFromAscii(".uno:FunctionBarVisible"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FunctionBarVisible")), m_xFrame->getName(), 0, propertyValue ); @@ -418,12 +412,6 @@ sal_Bool SoPluginInstance::Destroy(void) if(m_dParentStyl != 0) NSP_RestoreWinStyl(m_hParent, m_dParentStyl); #endif -// if(m_xDispatcher.is()){ -// m_xDispatcher->executeDispatch(m_xDispatchProvider, -// ::rtl::OUString::createFromAscii(".uno:CloseFrame"), -// ::rtl::OUString::createFromAscii("_top"), 0, -// Sequence< ::com::sun::star::beans::PropertyValue >() ); -// } uno::Reference< util::XCloseable > xCloseable( m_xFrame, uno::UNO_QUERY ); @@ -488,8 +476,10 @@ sal_Bool SoPluginInstance::Print(void) Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1); m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString::createFromAscii(".uno:PrintDefault"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:PrintDefault")), m_xFrame->getName(), 0, propertyValue ); return sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/so_instance.hxx b/extensions/source/nsplugin/source/so_instance.hxx index e95bb7c024ec..54974799f9a4 100644 --- a/extensions/source/nsplugin/source/so_instance.hxx +++ b/extensions/source/nsplugin/source/so_instance.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. @@ -108,3 +109,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx index 49c899994424..ccd879020ec1 100644 --- a/extensions/source/nsplugin/source/so_main.cxx +++ b/extensions/source/nsplugin/source/so_main.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. @@ -44,7 +45,6 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <winsock2.h> -#include <stdlib.h> #include <malloc.h> #include <memory.h> #include <tchar.h> @@ -65,6 +65,7 @@ #include "nsp_func.hxx" #include "sal/main.h" +#include <sal/macros.h> #include "rtl/process.h" #include "rtl/bootstrap.hxx" @@ -84,7 +85,6 @@ #include "com/sun/star/bridge/XUnoUrlResolver.hpp" #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) -#define ARLEN(x) sizeof (x) / sizeof *(x) using namespace ::rtl; using namespace ::osl; @@ -388,7 +388,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f oslProcessError rc = osl_executeProcess( aOfficePath.pData, ar_args, - ARLEN( ar_args ), + SAL_N_ELEMENTS( ar_args ), osl_Process_DETACHED, sec.getHandle(), 0, // => current working dir @@ -495,3 +495,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) _exit(0); return EXIT_SUCCESS; // avoid warnings } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/nsplugin/source/so_msg.hxx b/extensions/source/nsplugin/source/so_msg.hxx index ee3d5fff75f8..8a539ed72a87 100644 --- a/extensions/source/nsplugin/source/so_msg.hxx +++ b/extensions/source/nsplugin/source/so_msg.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. @@ -52,3 +53,5 @@ typedef struct _PLUGIN_MSG { } PLUGIN_MSG; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/comifaces.hxx b/extensions/source/ole/comifaces.hxx index ce184f9db6a6..70308715ef4d 100644 --- a/extensions/source/ole/comifaces.hxx +++ b/extensions/source/ole/comifaces.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. @@ -67,3 +68,5 @@ IUnoTypeWrapper: public IUnknown #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/jscriptclasses.cxx b/extensions/source/ole/jscriptclasses.cxx index a38044f92a4c..b2f75f1e667c 100644 --- a/extensions/source/ole/jscriptclasses.cxx +++ b/extensions/source/ole/jscriptclasses.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. @@ -319,3 +320,5 @@ STDMETHODIMP JScriptOutParam::Invoke( DISPID dispIdMember, return ret; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/jscriptclasses.hxx b/extensions/source/ole/jscriptclasses.hxx index f583a7962e03..77ad5d3e5799 100644 --- a/extensions/source/ole/jscriptclasses.hxx +++ b/extensions/source/ole/jscriptclasses.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. @@ -32,9 +33,8 @@ #pragma warning (disable:4548) #include <tools/presys.h> -//#include "stdafx.h" #define STRICT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM #if OSL_DEBUG_LEVEL > 0 //#define _ATL_DEBUG_INTERFACES @@ -42,7 +42,6 @@ #include <atlbase.h> extern CComModule _Module; #include <atlcom.h> -#include <tools/postsys.h> #pragma warning (pop) #pragma warning (disable:4505) @@ -158,4 +157,8 @@ private: CComVariant m_varValue; }; +#include <tools/postsys.h> + #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk index 806cd027eaae..58a2cc7f0453 100644 --- a/extensions/source/ole/makefile.mk +++ b/extensions/source/ole/makefile.mk @@ -47,9 +47,9 @@ INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i)) .IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"=="" -.IF "$(USE_STLP_DEBUG)"!="" +.IF "$(USE_DEBUG_RUNTIME)"!="" CDEFS+=-D_DEBUG -.ENDIF # "$(USE_STLP_DEBUG)"!="" +.ENDIF # "$(USE_DEBUG_RUNTIME)"!="" SLOFILES= \ $(SLO)$/servreg.obj \ @@ -71,7 +71,6 @@ OWNGUIDCDEFS+= -DOWNGUID SHL1TARGET=$(TARGET) SHL1STDLIBS=\ $(SALLIB) \ - $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(OLE32LIB) \ @@ -81,7 +80,7 @@ SHL1STDLIBS=\ .IF "$(COM)"=="MSC" .IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999" -.IF "$(USE_STLP_DEBUG)" != "" +.IF "$(USE_DEBUG_RUNTIME)" != "" SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib .ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib @@ -99,7 +98,6 @@ DEF1EXPORTFILE=$(SHL1TARGET).dxp SHL2TARGET=$(TARGET2) SHL2STDLIBS=\ $(SALLIB) \ - $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(OLE32LIB) \ @@ -109,7 +107,7 @@ SHL2STDLIBS=\ .IF "$(COM)"=="MSC" .IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999" -.IF "$(USE_STLP_DEBUG)" != "" +.IF "$(USE_DEBUG_RUNTIME)" != "" SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib .ELSE SHL2STDLIBS+= $(ATL_LIB)$/atls.lib @@ -123,7 +121,7 @@ SHL2OBJS=$(REAL_OWNGUID_SLOFILES) DEF2NAME=$(SHL2TARGET) DEF2EXPORTFILE=$(TARGET).dxp -.ENDIF +.ENDIF # "$(GUI)" == "WNT" && "$(DISABLE_ATL)"=="" #---------------------------------------------------------------- diff --git a/extensions/source/ole/ole2uno.cxx b/extensions/source/ole/ole2uno.cxx index 1a9e34a8bdec..9bf89b02a398 100644 --- a/extensions/source/ole/ole2uno.cxx +++ b/extensions/source/ole/ole2uno.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. @@ -54,20 +55,6 @@ Mutex * getBridgeMutex() } -// Mutex* getBridgeMutex() -// { -// static Mutex* pMutex= NULL; - -// if( ! pMutex) -// { -// MutexGuard guard( Mutex::getGlobalMutex() ); -// if( !pMutex) -// { -// static Mutex aMutex; -// pMutex= &aMutex; -// } -// } -// return pMutex; -// } - } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index ff97f5910ab9..55ca3104bd64 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.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. @@ -48,12 +49,12 @@ #pragma warning (disable:4005) #pragma warning (disable:4548) -#include <tools/prewin.h> +#include <prewin.h> #include <tchar.h> #if (_MSC_VER >= 1200) || defined(__MINGW32__) #include <dispex.h> #endif -#include <tools/postwin.h> +#include <postwin.h> #include <tools/presys.h> #include <list> @@ -90,10 +91,9 @@ using namespace com::sun::star::registry; using namespace com::sun::star::reflection; using namespace com::sun::star::beans; using namespace osl; -using namespace rtl; using namespace std; - +using ::rtl::OUString; namespace ole_adapter { @@ -143,3 +143,4 @@ Mutex* getBridgeMutex(); #endif // _OLE2UNO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx index 9f7999ed184b..a2ac152fd8e2 100644 --- a/extensions/source/ole/oledll.cxx +++ b/extensions/source/ole/oledll.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. @@ -29,13 +30,13 @@ #include "precompiled_extensions.hxx" #define STRICT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM #pragma warning (push,1) #pragma warning (disable:4548) -#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_STLP_DEBUG) +#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_DEBUG_RUNTIME) #undef _DEBUG #endif #ifdef __MINGW32__ @@ -68,3 +69,4 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) return TRUE; // ok } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 949fb6c7c9b2..6648d1773560 100755..100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.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. @@ -49,6 +50,7 @@ #include <com/sun/star/script/XEngine.hpp> #include <com/sun/star/script/InterruptEngineEvent.hpp> #include <com/sun/star/script/XLibraryAccess.hpp> +#include <com/sun/star/script/BasicErrorException.hpp> #include <com/sun/star/bridge/ModelDependent.hpp> #include "com/sun/star/bridge/oleautomation/NamedArgument.hpp" @@ -67,7 +69,6 @@ using namespace std; using namespace boost; using namespace osl; -using namespace rtl; using namespace cppu; using namespace com::sun::star::script; using namespace com::sun::star::lang; @@ -76,6 +77,10 @@ using namespace com::sun::star::bridge::oleautomation; using namespace com::sun::star::bridge::ModelDependent; using namespace ::com::sun::star; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringBuffer; + #define JSCRIPT_ID_PROPERTY L"_environment" #define JSCRIPT_ID L"jscript" namespace ole_adapter @@ -90,16 +95,16 @@ namespace ole_adapter // called. // Before UNO object is wrapped to COM object this map is checked // to see if the UNO object is already a wrapper. -hash_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap; +boost::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap; // key: XInterface of the wrapper object. // value: XInterface of the Interface created by the Invocation Adapter Factory. // A COM wrapper is responsible for removing the corresponding entry // in AdapterToWrappperMap if it is being destroyed. Because the wrapper does not // know about its adapted interface it uses WrapperToAdapterMap to get the // adapted interface which is then used to locate the entry in AdapterToWrapperMap. -hash_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap; +boost::unordered_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap; -hash_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; +boost::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; /***************************************************************************** class implementation IUnknownWrapper_Impl @@ -126,7 +131,7 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl() #endif // remove entries in global maps - typedef hash_map<sal_uInt32, sal_uInt32>::iterator _IT; + typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator _IT; _IT it= WrapperToAdapterMap.find( (sal_uInt32) xIntRoot); if( it != WrapperToAdapterMap.end()) { @@ -153,7 +158,7 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t) return Any(); if (t == getCppuType(static_cast<Reference<XDefaultProperty>*>( 0)) && !m_bHasDfltProperty ) return Any(); - if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) && !m_spDispatch) + if ( ( t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) || t == getCppuType(static_cast<Reference<XAutomationInvocation>*>( 0)) ) && !m_spDispatch) return Any(); return WeakImplHelper7<XInvocation, XBridgeSupplier2, @@ -168,6 +173,61 @@ Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection( return ret; } +Any SAL_CALL IUnknownWrapper_Impl::invokeGetProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) +{ + Any aResult; + try + { + o2u_attachCurrentThread(); + ITypeInfo * pInfo = getTypeInfo(); + FuncDesc aDescGet(pInfo); + FuncDesc aDescPut(pInfo); + VarDesc aVarDesc(pInfo); + getPropDesc(aPropertyName, & aDescGet, & aDescPut, & aVarDesc); + if ( !aDescGet ) + { + OUString msg(OUSTR("[automation bridge]Property \"") + aPropertyName + + OUSTR("\" is not supported")); + throw UnknownPropertyException(msg, Reference<XInterface>()); + } + aResult = invokeWithDispIdComTlb( aDescGet, aPropertyName, aParams, aOutParamIndex, aOutParam ); + } + catch ( Exception& e ) + { + throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::invokeGetProperty ! Message : \n") + + e.Message, Reference<XInterface>()); + } + return aResult; +} + +Any SAL_CALL IUnknownWrapper_Impl::invokePutProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) +{ + Any aResult; + try + { + o2u_attachCurrentThread(); + ITypeInfo * pInfo = getTypeInfo(); + FuncDesc aDescGet(pInfo); + FuncDesc aDescPut(pInfo); + VarDesc aVarDesc(pInfo); + getPropDesc(aPropertyName, & aDescGet, & aDescPut, & aVarDesc); + if ( !aDescPut ) + { + OUString msg(OUSTR("[automation bridge]Property \"") + aPropertyName + + OUSTR("\" is not supported")); + throw UnknownPropertyException(msg, Reference<XInterface>()); + } + aResult = invokeWithDispIdComTlb( aDescPut, aPropertyName, aParams, aOutParamIndex, aOutParam ); + } + catch ( Exception& e ) + { + throw RuntimeException(OUSTR("[automation bridge] unexpected exception in " + "IUnknownWrapper_Impl::invokePutProperty ! Message : \n") + + e.Message, Reference<XInterface>()); + } + return aResult; +} Any SAL_CALL IUnknownWrapper_Impl::invoke( const OUString& aFunctionName, @@ -214,6 +274,10 @@ Any SAL_CALL IUnknownWrapper_Impl::invoke( const OUString& aFunctionName, { throw; } + catch (InvocationTargetException &) + { + throw; + } catch (BridgeRuntimeError & e) { throw RuntimeException(e.message, Reference<XInterface>()); @@ -269,7 +333,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName, OUString msg(OUSTR("[automation bridge] Property ") + aPropertyName + OUSTR(" is read-only")); OString sMsg = OUStringToOString(msg, osl_getThreadTextEncoding()); - OSL_ENSURE(0, sMsg.getStr()); + OSL_FAIL(sMsg.getStr()); // ignore silently return; } @@ -431,7 +495,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) // Instead here I chose a name that should be illegal both in COM and // UNO ( from an IDL point of view ) therefore I think this is a safe // hack - if ( aPropertyName.equals( rtl::OUString::createFromAscii("$GetTypeName") )) + if ( aPropertyName.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$GetTypeName")) )) { if ( pInfo && m_sTypeName.getLength() == 0 ) { @@ -659,12 +723,16 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasProperty( const OUString& aName ) FuncDesc aDescPut(pInfo); VarDesc aVarDesc(pInfo); getPropDesc(aName, & aDescGet, & aDescPut, & aVarDesc); - // Automation properties can have parameters. If so, we access them through - // XInvocation::invoke. Thas is, hasProperty must return false for such a - // property + + // we should probably just check the funckind + // basic has been modified to handle properties ( 'get' ) props at + // least with paramaters + // additionally you can call invoke(Get|Set)Property on the bridge + // you can determine if a property has parameter is hasMethod + // returns true for the name if (aVarDesc - || aDescPut && aDescPut->cParams == 0 - || aDescGet && aDescGet->cParams == 0) + || aDescPut + || aDescGet ) { ret = sal_True; } @@ -1661,6 +1729,19 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) { + // Get type info for the call. It can be a method call or property put or + // property get operation. + FuncDesc aFuncDesc(getTypeInfo()); + getFuncDescForInvoke(sFuncName, Params, & aFuncDesc); + return invokeWithDispIdComTlb( aFuncDesc, sFuncName, Params, OutParamIndex, OutParam ); +} + +Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, + const OUString& sFuncName, + const Sequence< Any >& Params, + Sequence< sal_Int16 >& OutParamIndex, + Sequence< Any >& OutParam) +{ Any ret; HRESULT result; @@ -1679,10 +1760,6 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName, sal_Int32 revIndex = 0; bool bVarargParam = false; - // Get type info for the call. It can be a method call or property put or - // property get operation. - FuncDesc aFuncDesc(getTypeInfo()); - getFuncDescForInvoke(sFuncName, Params, & aFuncDesc); //Set the array of DISPIDs for named args if it is a property put operation. //If there are other named arguments another array is set later on. @@ -2089,11 +2166,24 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName, "DISP_E_BADVARTYPE."), 0); break; case DISP_E_EXCEPTION: + { message = OUSTR("[automation bridge]: "); message += OUString(reinterpret_cast<const sal_Unicode*>(excepinfo.bstrDescription), ::SysStringLen(excepinfo.bstrDescription)); - throw InvocationTargetException(message, Reference<XInterface>(), Any()); + + // Add for VBA, to throw an exception with the correct error code and message. + sal_Int32 nErrorCode = excepinfo.wCode; + if ( nErrorCode == 0 ) + { + // The low 16-bit of scode describing the error or warning. + nErrorCode = ( excepinfo.scode & 0xFFFF ); + } + BasicErrorException aBasicErrExp(message, Reference<XInterface>(), nErrorCode, message); + throw InvocationTargetException(message, Reference<XInterface>(), makeAny(aBasicErrExp)); + // End add + break; + } case DISP_E_MEMBERNOTFOUND: message = OUSTR("[automation bridge]: A function with the name \"") + sFuncName + OUSTR("\" is not supported. Object returned " @@ -2226,11 +2316,17 @@ void IUnknownWrapper_Impl::getFuncDesc(const OUString & sFuncName, FUNCDESC ** p //get the associated index and add an entry to the map //with the name sFuncName which differs in the casing of the letters to //the actual name as obtained from ITypeInfo - cit itOrg = m_mapComFunc.find(OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(memberName)))); + OUString sRealName(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(memberName))); + cit itOrg = m_mapComFunc.find(sRealName); OSL_ASSERT(itOrg != m_mapComFunc.end()); + // maybe this is a property, if so we need + // to store either both id's ( put/get ) or + // just the get. Storing both is more consistent + pair<cit, cit> pItems = m_mapComFunc.equal_range( sRealName ); + for ( ;pItems.first != pItems.second; ++pItems.first ) + m_mapComFunc.insert( TLBFuncIndexMap::value_type ( make_pair(sFuncName, pItems.first->second ) )); itIndex = - m_mapComFunc.insert( TLBFuncIndexMap::value_type - ( make_pair(sFuncName, itOrg->second ) )); + m_mapComFunc.find( sFuncName ); } } } @@ -2337,56 +2433,69 @@ void IUnknownWrapper_Impl::getPropDesc(const OUString & sFuncName, FUNCDESC ** p //else no entry for sFuncName, pFuncDesc will not be filled in } -VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc) +VARTYPE IUnknownWrapper_Impl::getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD nHrefType ) { VARTYPE _type( VT_NULL ); - - if (desc->vt == VT_PTR) - { - _type = getElementTypeDesc(desc->lptdesc); - _type |= VT_BYREF; - } - else if (desc->vt == VT_SAFEARRAY) - { - _type = getElementTypeDesc(desc->lptdesc); - _type |= VT_ARRAY; - } - else if (desc->vt == VT_USERDEFINED) + if ( pTypeInfo ) { - ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance - CComPtr<ITypeInfo> spRefInfo; - thisInfo->GetRefTypeInfo(desc->hreftype, & spRefInfo.p); - if (spRefInfo) + CComPtr<ITypeInfo> spRefInfo; + pTypeInfo->GetRefTypeInfo( nHrefType, &spRefInfo.p ); + if ( spRefInfo ) { - TypeAttr attr(spRefInfo); - spRefInfo->GetTypeAttr( & attr); - if (attr->typekind == TKIND_ENUM) + TypeAttr attr( spRefInfo ); + spRefInfo->GetTypeAttr( &attr ); + if ( attr->typekind == TKIND_ENUM ) { - //We use the type of the first enum value. - if (attr->cVars == 0) + // We use the type of the first enum value. + if ( attr->cVars == 0 ) { - throw BridgeRuntimeError(OUSTR("[automation bridge] Could " - "not obtain type description")); + throw BridgeRuntimeError(OUSTR("[automation bridge] Could not obtain type description")); } - VarDesc var(spRefInfo); - spRefInfo->GetVarDesc(0, & var); + VarDesc var( spRefInfo ); + spRefInfo->GetVarDesc( 0, &var ); _type = var->lpvarValue->vt; } - else if (attr->typekind == TKIND_INTERFACE) + else if ( attr->typekind == TKIND_INTERFACE ) { _type = VT_UNKNOWN; } - else if (attr->typekind == TKIND_DISPATCH) + else if ( attr->typekind == TKIND_DISPATCH ) { _type = VT_DISPATCH; } + else if ( attr->typekind == TKIND_ALIAS ) + { + // TKIND_ALIAS is a type that is an alias for another type. So get that alias type. + _type = getUserDefinedElementType( pTypeInfo, attr->tdescAlias.hreftype ); + } else { - throw BridgeRuntimeError(OUSTR("[automation bridge] " - "Unhandled user defined type.")); + throw BridgeRuntimeError( OUSTR("[automation bridge] Unhandled user defined type.") ); } } } + return _type; +} + +VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc) +{ + VARTYPE _type( VT_NULL ); + + if (desc->vt == VT_PTR) + { + _type = getElementTypeDesc(desc->lptdesc); + _type |= VT_BYREF; + } + else if (desc->vt == VT_SAFEARRAY) + { + _type = getElementTypeDesc(desc->lptdesc); + _type |= VT_ARRAY; + } + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance + _type = getUserDefinedElementType( thisInfo, desc->hreftype ); + } else { _type = desc->vt; @@ -2539,3 +2648,4 @@ ITypeInfo* IUnknownWrapper_Impl::getTypeInfo() } // end namespace +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index fa796013946e..0be19ddc6cff 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.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. @@ -35,14 +36,14 @@ #endif #include <tools/presys.h> -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG #endif #include <atlbase.h> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <tools/postsys.h> #ifdef _MSC_VER @@ -54,6 +55,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp> +#include <com/sun/star/script//XAutomationInvocation.hpp> #include <rtl/ustring.hxx> #include <com/sun/star/script/XDefaultProperty.hpp> @@ -64,20 +66,20 @@ #include "unoconversionutilities.hxx" #include "windata.hxx" using namespace cppu; -using namespace rtl; using namespace std; using namespace com::sun::star::lang; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::oleautomation; +using ::rtl::OUString; namespace ole_adapter { -typedef hash_map<OUString, pair<DISPID, unsigned short>, hashOUString_Impl, equalOUString_Impl> DispIdMap; +typedef boost::unordered_map<OUString, pair<DISPID, unsigned short>, hashOUString_Impl, equalOUString_Impl> DispIdMap; -typedef hash_multimap<OUString, unsigned int, hashOUString_Impl, equalOUString_Impl> TLBFuncIndexMap; +typedef boost::unordered_multimap<OUString, unsigned int, hashOUString_Impl, equalOUString_Impl> TLBFuncIndexMap; // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object. // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component. @@ -138,10 +140,21 @@ public: // XDefaultMethod virtual ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } + virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const ::rtl::OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + // XDirectInvocation virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL hasMember( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + + Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, + const OUString& sFuncName, + const Sequence< Any >& Params, + Sequence< sal_Int16 >& OutParamIndex, + Sequence< Any >& OutParam); + + protected: // ---------------------------------------------------------------------------- virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName, @@ -197,8 +210,11 @@ protected: /** Returns the DISPID for a function or property name. If true is returned then id contains a valid DISPID. */ + bool getDispid(const OUString& sFuncName, DISPID * id); + VARTYPE getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD nHrefType ); + /** Gets the element type in a VARIANT like style. E.g. if desc->lptdesc contains a VT_PTR than it is replaced by VT_BYREF and VT_SAFEARRAY is replaced by VT_ARRAY If the TYPEDESC describes an SAFEARRAY then varType is a combination of VT_ARRAY @@ -276,3 +292,4 @@ protected: } // end namespace #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx index bd6d8652d902..bd17dff2b90e 100644 --- a/extensions/source/ole/olethread.cxx +++ b/extensions/source/ole/olethread.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. @@ -36,9 +37,8 @@ #include <tools/presys.h> #include <tools/postsys.h> -#include <vos/thread.hxx> +#include <osl/thread.hxx> -using namespace vos; using namespace std; namespace ole_adapter @@ -50,7 +50,7 @@ typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInit)( LPVOID); void o2u_attachCurrentThread() { - static OThreadData oleThreadData; + static osl::ThreadData oleThreadData; if ((sal_Bool)(sal_IntPtr)oleThreadData.getData() != sal_True) { @@ -75,3 +75,5 @@ void o2u_attachCurrentThread() } } // end namespace + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 18f3bc26f9b7..5d51cdbc5d3b 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.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. @@ -28,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" +#include <vector> + #ifdef __MINGW32__ #define INITGUID #include <initguid.h> @@ -41,7 +44,7 @@ #include <rtl/unload.h> #include <tools/presys.h> -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG @@ -52,24 +55,19 @@ extern CComModule _Module; #include <tools/postsys.h> -using namespace std; using namespace cppu; -using namespace rtl; using namespace osl; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::ModelDependent; - +using ::rtl::OUString; namespace ole_adapter { #include <initguid.h> -// prior 5.2 ( src569 ver m) -// {3ECF78F0-B149-11D2-8EBE-00105AD848AF} -//DEFINE_GUID(OID_ServiceManager, 0x3ECF78F0, 0xB149, 0x11d2, 0x8E, 0xBE, 0x00, 0x10, 0x5A, 0xD8, 0x48, 0xAF); #ifndef OWNGUID // GUID used since 5.2 ( src569 m) @@ -752,3 +750,5 @@ sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUI } // end namespace + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx index bbce935aa98e..4c48995db11f 100644 --- a/extensions/source/ole/servprov.hxx +++ b/extensions/source/ole/servprov.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. @@ -29,14 +30,11 @@ #define _SERVPROV_HXX #include <com/sun/star/lang/XInitialization.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase2.hxx> -#endif #include "ole2uno.hxx" #include "unoconversionutilities.hxx" - using namespace com::sun::star::bridge; using namespace cppu; using namespace std; @@ -149,7 +147,6 @@ public: protected: - //ORefCount m_refCount; oslInterlockedCount m_refCount; Reference<XInterface> m_xInst; GUID m_guid; @@ -276,5 +273,4 @@ protected: } // end namespace #endif - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index f5d6c8080a15..d69d4dab6205 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.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. @@ -33,10 +34,11 @@ #include "servprov.hxx" #include <rtl/ustring.hxx> #include <cppuhelper/factory.hxx> -using namespace rtl; using namespace ole_adapter; using namespace cppu; +using ::rtl::OUString; + namespace ole_adapter { rtl_StandardModuleCount globalModuleCount= MODULE_COUNT_INIT; @@ -130,3 +132,5 @@ extern "C" sal_Bool component_canUnload( TimeValue* libUnused) { return globalModuleCount.canUnload( &globalModuleCount, libUnused); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index da95b9950427..b6ac7f1caff0 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.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. @@ -40,7 +41,7 @@ #include "ole2uno.hxx" #include "unotypewrapper.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> // for some reason DECIMAL_NEG (wtypes.h) which contains BYTE is not resolved. typedef unsigned char BYTE; @@ -71,17 +72,17 @@ using namespace com::sun::star::bridge::oleautomation; using namespace boost; namespace ole_adapter { -extern hash_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap; -extern hash_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap; -typedef hash_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap; -typedef hash_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap; +extern boost::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap; +extern boost::unordered_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap; +typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap; +typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap; //Maps IUnknown pointers to a weak reference of the respective wrapper class (e.g. // IUnknownWrapperImpl. It is the responsibility of the wrapper to remove the entry when // it is being destroyed. // Used to ensure that an Automation object is always mapped to the same UNO objects. -extern hash_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; -typedef hash_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com; -typedef hash_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com; +extern boost::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap; +typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com; +typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com; // Maps XInterface pointers to a weak reference of its wrapper class (i.e. // InterfaceOleWrapper_Impl). It is the responsibility of the wrapper to remove the entry when @@ -89,9 +90,9 @@ typedef hash_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com // is mapped to IDispatch which is kept alive in the COM environment. If the same // UNO interface is mapped again to COM then the IDispach of the first mapped instance // must be returned. -extern hash_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap; -typedef hash_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno; -typedef hash_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno; +extern boost::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap; +typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno; +typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno; #ifdef __MINGW32__ inline void reduceRange( Any& any); #endif @@ -562,13 +563,6 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny, bFail = true; break; default: -// case TypeClass_SERVICE: break; // meta construct -// case TypeClass_TYPEDEF: break; -// case TypeClass_UNION: break; -// case TypeClass_MODULE: break; // module -// case TypeClass_EXCEPTION: break; -// case TypeClass_ARRAY: break; // there's no Array at the moment -// case TypeClass_UNKNOWN: break; bCannotConvert = true; break; } @@ -1426,7 +1420,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT else { Reference<XInterface> xIntComWrapper = xInt; - typedef hash_map<sal_uInt32,sal_uInt32>::iterator _IT; + typedef boost::unordered_map<sal_uInt32,sal_uInt32>::iterator _IT; // Adapter? then get the COM wrapper to which the adapter delegates its calls _IT it= AdapterToWrapperMap.find( (sal_uInt32) xInt.get()); if( it != AdapterToWrapperMap.end() ) @@ -1916,7 +1910,7 @@ Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Ty // in a global map. Thus we can determine in a call to createUnoObjectWrapper whether the UNO // object is a wrapped COM object. In that case we extract the original COM object rather than // creating a wrapper around the UNO object. - typedef hash_map<sal_uInt32,sal_uInt32>::value_type VALUE; + typedef boost::unordered_map<sal_uInt32,sal_uInt32>::value_type VALUE; AdapterToWrapperMap.insert( VALUE( (sal_uInt32) xIntAdapted.get(), (sal_uInt32) receiver.get())); WrapperToAdapterMap.insert( VALUE( (sal_uInt32) receiver.get(), (sal_uInt32) xIntAdapted.get())); } @@ -2448,3 +2442,4 @@ inline void reduceRange( Any& any) } // end namespace #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 182726cd95bc..fe1ff488c154 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.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. @@ -34,13 +35,12 @@ #include <olectl.h> #include <vector> #include <list> -#include <hash_map> -#include "comifaces.hxx" +#include <boost/unordered_map.hpp> #include <tools/postsys.h> -#include <vos/diagnose.hxx> -#include <vos/refernce.hxx> +#include <osl/diagnose.h> +#include <salhelper/simplereferenceobject.hxx> #include <tools/debug.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/beans/MethodConcept.hpp> @@ -65,9 +65,7 @@ #include "unoobjw.hxx" #include "servprov.hxx" -using namespace vos; using namespace std; -using namespace rtl; using namespace osl; using namespace cppu; using namespace com::sun::star::uno; @@ -78,7 +76,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::bridge::ModelDependent; using namespace com::sun::star::reflection; - +using ::rtl::OUString; #if _MSC_VER < 1200 extern "C" const GUID IID_IDispatchEx; @@ -86,7 +84,7 @@ extern "C" const GUID IID_IDispatchEx; namespace ole_adapter { -hash_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap; +boost::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap; static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource); static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource); static HRESULT mapCannotConvertException( CannotConvertException e, unsigned int * puArgErr); @@ -456,7 +454,7 @@ sal_Bool InterfaceOleWrapper_Impl::getInvocationInfoForCall( DISPID id, Invocat typedef NameToIdMap::const_iterator cit; OUString sMemberName; - for(cit ci1= m_nameToDispIdMap.begin(); ci1 != m_nameToDispIdMap.end(); ci1++) + for(cit ci1= m_nameToDispIdMap.begin(); ci1 != m_nameToDispIdMap.end(); ++ci1) { if( (*ci1).second == id) // iterator is a pair< OUString, DISPID> { @@ -1125,7 +1123,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s sal_Bool bStruct= sal_False; - Reference<XInterface> xIntCore= m_smgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection")); + Reference<XInterface> xIntCore= m_smgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection"))); Reference<XIdlReflection> xRefl( xIntCore, UNO_QUERY); if( xRefl.is() ) { @@ -1686,3 +1684,5 @@ const VARTYPE getVarType( const Any& value) } // end namespace + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx index 172b72aa4525..b3ee2a6b6ce9 100644 --- a/extensions/source/ole/unoobjw.hxx +++ b/extensions/source/ole/unoobjw.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. @@ -32,12 +33,9 @@ #include <com/sun/star/beans/XExactName.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/script/InvocationInfo.hpp> -#include <vos/refernce.hxx> +#include <salhelper/simplereferenceobject.hxx> -#include <tools/presys.h> #include "comifaces.hxx" -#include <tools/postsys.h> - #include "ole2uno.hxx" #include "unoconversionutilities.hxx" @@ -88,7 +86,7 @@ struct MemberInfo OUString name; }; -typedef hash_map +typedef boost::unordered_map < OUString, DISPID, @@ -96,7 +94,7 @@ typedef hash_map equalOUString_Impl > NameToIdMap; -typedef hash_map +typedef boost::unordered_map < OUString, sal_Bool, @@ -104,7 +102,7 @@ typedef hash_map equalOUString_Impl > BadNameMap; -typedef hash_map +typedef boost::unordered_map < DISPID, MemberInfo @@ -220,7 +218,6 @@ protected: sal_Bool getInvocationInfoForCall(DISPID id, InvocationInfo& info); -// vos::ORefCount m_refCount; Reference<XInvocation> m_xInvocation; Reference<XExactName> m_xExactName; Reference<XInterface> m_xOrigin; @@ -293,8 +290,8 @@ protected: }; - - } // end namespace #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index da2cc93349eb..ea0393d55ee9 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.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. @@ -177,3 +178,4 @@ STDMETHODIMP UnoTypeWrapper::get_Name(BSTR *pVal) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx index 32346bc27900..b43dcd7bc46c 100644 --- a/extensions/source/ole/unotypewrapper.hxx +++ b/extensions/source/ole/unotypewrapper.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. @@ -31,17 +32,15 @@ #pragma warning (disable:4548) #include <tools/presys.h> -//#include "stdafx.h" #define STRICT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM -#if OSL_DEBUG_LEVEL > 0 -//#define _ATL_DEBUG_INTERFACES +#if OSL_DEBUG_LEVEL > 1 +#define _ATL_DEBUG_INTERFACES #endif #include <atlbase.h> extern CComModule _Module; #include <atlcom.h> -#include <tools/postsys.h> #pragma warning (pop) #pragma warning (disable:4505) @@ -98,4 +97,9 @@ public: CComBSTR m_sName; }; +// This here so that WIN_ULONG is used also in the magic macros above +#include <tools/postsys.h> + #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/windata.cxx b/extensions/source/ole/windata.cxx index fd9363bccd71..267478b8eb5c 100644 --- a/extensions/source/ole/windata.cxx +++ b/extensions/source/ole/windata.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. @@ -38,3 +39,4 @@ namespace ole_adapter } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx index b6e86228bc23..ed951f248ea2 100644 --- a/extensions/source/ole/windata.hxx +++ b/extensions/source/ole/windata.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. @@ -196,3 +197,5 @@ public: } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx index 1dad223a3c76..00b6978a1e1d 100644 --- a/extensions/source/oooimprovecore/core.cxx +++ b/extensions/source/oooimprovecore/core.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. * @@ -42,7 +43,7 @@ #include <cppuhelper/implbase3.hxx> #include <svx/svxdlg.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svl/itemset.hxx> #include <svl/stritem.hxx> #include <sfx2/app.hxx> @@ -120,19 +121,19 @@ namespace oooimprovecore OUString help_url; Reference<XCoreController> core_c( - xServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.CoreController")), + xServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"))), UNO_QUERY); if(core_c.is()) ::comphelper::ConfigurationHelper::readDirectKey( xServiceFactory, - OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), - OUString::createFromAscii("Participation"), - OUString::createFromAscii("HelpUrl"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings")), + OUString(RTL_CONSTASCII_USTRINGPARAM("Participation")), + OUString(RTL_CONSTASCII_USTRINGPARAM("HelpUrl")), ::comphelper::ConfigurationHelper::E_READONLY) >>= help_url; else - help_url = OUString::createFromAscii("http://www.openoffice.org"); + help_url = OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.libreoffice.org")); { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SfxAllItemSet aSet( SFX_APP()->GetPool() ); aSet.Put( SfxStringItem( SID_CURRENT_URL, help_url ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -160,12 +161,12 @@ namespace oooimprovecore { return getSupportedServiceNames_static(); } OUString SAL_CALL Core::getImplementationName_static() - { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovecore.Core"); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovecore.Core")); } Sequence<OUString> SAL_CALL Core::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.Core"); + aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core")); return aServiceNames; } @@ -188,3 +189,5 @@ namespace oooimprovecore static OAutoRegistration<Core> auto_reg; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovecore/oooimprovecore_module.cxx b/extensions/source/oooimprovecore/oooimprovecore_module.cxx index 5a7dd0449770..f77d45f2393a 100644 --- a/extensions/source/oooimprovecore/oooimprovecore_module.cxx +++ b/extensions/source/oooimprovecore/oooimprovecore_module.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. @@ -35,3 +36,4 @@ namespace oooimprovecore IMPLEMENT_COMPONENT_MODULE( OooimprovecoreModule ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovecore/oooimprovecore_module.hxx b/extensions/source/oooimprovecore/oooimprovecore_module.hxx index 8c0943dda560..432dcc71997d 100644 --- a/extensions/source/oooimprovecore/oooimprovecore_module.hxx +++ b/extensions/source/oooimprovecore/oooimprovecore_module.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. @@ -36,3 +37,4 @@ namespace oooimprovecore } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovecore/oooimprovecore_services.cxx b/extensions/source/oooimprovecore/oooimprovecore_services.cxx index da0c15c4694e..0682cdef2947 100644 --- a/extensions/source/oooimprovecore/oooimprovecore_services.cxx +++ b/extensions/source/oooimprovecore/oooimprovecore_services.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. @@ -36,17 +37,12 @@ namespace oooimprovecore static void initializeModule() { - static bool bInitialized(false); - if (!bInitialized) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if (!bInitialized) - { - createRegistryInfo_Core(); - } - } + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); + createRegistryInfo_Core(); } } IMPLEMENT_COMPONENT_LIBRARY_API( ::oooimprovecore::OooimprovecoreModule, ::oooimprovecore::initializeModule) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx index 67658f405414..751adf3c965d 100644 --- a/extensions/source/oooimprovement/config.cxx +++ b/extensions/source/oooimprovement/config.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. * @@ -42,32 +43,32 @@ namespace { using namespace oooimprovement; - static const OUString CFG_COUNTERS = OUString::createFromAscii("Counters"); - static const OUString CFG_ENABLINGALLOWED = OUString::createFromAscii("EnablingAllowed"); - static const OUString CFG_EVENTSCOUNT = OUString::createFromAscii("LoggedEvents"); - static const OUString CFG_EXTENSION = OUString::createFromAscii("ooSetupExtension"); - static const OUString CFG_FAILEDATTEMPTS = OUString::createFromAscii("FailedAttempts"); - static const OUString CFG_INVACCEPT = OUString::createFromAscii("InvitationAccepted"); - static const OUString CFG_L10N = OUString::createFromAscii("L10N"); - static const OUString CFG_LOCALE = OUString::createFromAscii("ooLocale"); - static const OUString CFG_LOGGING = OUString::createFromAscii("/org.openoffice.Office.Logging"); - static const OUString CFG_LOGPATH = OUString::createFromAscii("LogPath"); - static const OUString CFG_NAME = OUString::createFromAscii("ooName"); - static const OUString CFG_OFFICESTARTCOUNTDOWN = OUString::createFromAscii("OfficeStartCounterdown"); - static const OUString CFG_OOOIMPROVEMENT = OUString::createFromAscii("OOoImprovement"); - static const OUString CFG_OOOIMPROVEMENTPACK = OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"); - static const OUString CFG_PARTICIPATION = OUString::createFromAscii("Participation"); - static const OUString CFG_PRODUCT = OUString::createFromAscii("Product"); - static const OUString CFG_REPORTCOUNT = OUString::createFromAscii("UploadedReports"); - static const OUString CFG_REPORTEREMAIL = OUString::createFromAscii("ReporterEmail"); - static const OUString CFG_SETUP = OUString::createFromAscii("/org.openoffice.Setup"); - static const OUString CFG_SHOWEDINV = OUString::createFromAscii("ShowedInvitation"); - static const OUString CFG_SOAPIDADD = OUString::createFromAscii("SoapIdAdditions"); - static const OUString CFG_SOAPURL = OUString::createFromAscii("SoapUrl"); - static const OUString CFG_UPLOAD = OUString::createFromAscii("Upload"); - static const OUString CFG_VERSION = OUString::createFromAscii("ooSetupVersion"); - - static const OUString SOAPID = OUString::createFromAscii("OpenOffice.org Improvement Report - Version 1\n"); + static const OUString CFG_COUNTERS(RTL_CONSTASCII_USTRINGPARAM("Counters")); + static const OUString CFG_ENABLINGALLOWED(RTL_CONSTASCII_USTRINGPARAM("EnablingAllowed")); + static const OUString CFG_EVENTSCOUNT(RTL_CONSTASCII_USTRINGPARAM("LoggedEvents")); + static const OUString CFG_EXTENSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension")); + static const OUString CFG_FAILEDATTEMPTS(RTL_CONSTASCII_USTRINGPARAM("FailedAttempts")); + static const OUString CFG_INVACCEPT(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted")); + static const OUString CFG_L10N(RTL_CONSTASCII_USTRINGPARAM("L10N")); + static const OUString CFG_LOCALE(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); + static const OUString CFG_LOGGING(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Logging")); + static const OUString CFG_LOGPATH(RTL_CONSTASCII_USTRINGPARAM("LogPath")); + static const OUString CFG_NAME(RTL_CONSTASCII_USTRINGPARAM("ooName")); + static const OUString CFG_OFFICESTARTCOUNTDOWN(RTL_CONSTASCII_USTRINGPARAM("OfficeStartCounterdown")); + static const OUString CFG_OOOIMPROVEMENT(RTL_CONSTASCII_USTRINGPARAM("OOoImprovement")); + static const OUString CFG_OOOIMPROVEMENTPACK(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings")); + static const OUString CFG_PARTICIPATION(RTL_CONSTASCII_USTRINGPARAM("Participation")); + static const OUString CFG_PRODUCT(RTL_CONSTASCII_USTRINGPARAM("Product")); + static const OUString CFG_REPORTCOUNT(RTL_CONSTASCII_USTRINGPARAM("UploadedReports")); + static const OUString CFG_REPORTEREMAIL(RTL_CONSTASCII_USTRINGPARAM("ReporterEmail")); + static const OUString CFG_SETUP(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); + static const OUString CFG_SHOWEDINV(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation")); + static const OUString CFG_SOAPIDADD(RTL_CONSTASCII_USTRINGPARAM("SoapIdAdditions")); + static const OUString CFG_SOAPURL(RTL_CONSTASCII_USTRINGPARAM("SoapUrl")); + static const OUString CFG_UPLOAD(RTL_CONSTASCII_USTRINGPARAM("Upload")); + static const OUString CFG_VERSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupVersion")); + + static const OUString SOAPID(RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org Improvement Report - Version 1\n")); static sal_Int32 incrementCfgValue( const Reference<XMultiServiceFactory> sm, @@ -182,14 +183,14 @@ namespace oooimprovement MyConfigurationHelper::E_READONLY) >>= value; result.append(value); - value = OUString::createFromAscii(""); + value = OUString(); MyConfigurationHelper::readDirectKey( m_ServiceFactory, CFG_SETUP, CFG_PRODUCT, CFG_VERSION, MyConfigurationHelper::E_READONLY) >>= value; if(value.getLength()) result.appendAscii(" ").append(value); - value = OUString::createFromAscii(""); + value = OUString(); MyConfigurationHelper::readDirectKey( m_ServiceFactory, CFG_SETUP, CFG_PRODUCT, CFG_EXTENSION, @@ -294,3 +295,5 @@ namespace oooimprovement resetFailedAttempts(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/config.hxx b/extensions/source/oooimprovement/config.hxx index d1e63fd76f7c..7bb737cb993a 100644 --- a/extensions/source/oooimprovement/config.hxx +++ b/extensions/source/oooimprovement/config.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. * @@ -50,9 +51,6 @@ namespace oooimprovement ::rtl::OUString getSoapId() const; ::rtl::OUString getSoapUrl() const; sal_Int32 getReportCount() const; -#ifdef FUTURE - sal_Int32 getFailedAttempts() const; -#endif sal_Int32 getOfficeStartCounterdown() const; sal_Int32 incrementEventCount(sal_Int32 by); sal_Int32 incrementReportCount(sal_Int32 by); @@ -66,3 +64,5 @@ namespace oooimprovement }; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx index 66e634768fef..269d947c3e08 100644 --- a/extensions/source/oooimprovement/corecontroller.cxx +++ b/extensions/source/oooimprovement/corecontroller.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. * @@ -75,15 +76,17 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL CoreController::getImplementationName_static() - { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.CoreController"); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.CoreController")); } Sequence<OUString> SAL_CALL CoreController::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.CoreController"); + aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController")); return aServiceNames; } Reference<XInterface> SAL_CALL CoreController::Create(const Reference<XMultiServiceFactory>& sm) { return *(new CoreController(sm)); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/corecontroller.hxx b/extensions/source/oooimprovement/corecontroller.hxx index b54495397dcb..925fa94f038d 100644 --- a/extensions/source/oooimprovement/corecontroller.hxx +++ b/extensions/source/oooimprovement/corecontroller.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. * @@ -82,3 +83,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/errormail.cxx b/extensions/source/oooimprovement/errormail.cxx index 73a8869a45a2..de7ef8db0e6f 100644 --- a/extensions/source/oooimprovement/errormail.cxx +++ b/extensions/source/oooimprovement/errormail.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. * @@ -205,3 +206,5 @@ namespace oooimprovement return result.makeStringAndClear(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/errormail.hxx b/extensions/source/oooimprovement/errormail.hxx index e7bd6df2b918..8b836514fcac 100644 --- a/extensions/source/oooimprovement/errormail.hxx +++ b/extensions/source/oooimprovement/errormail.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. * @@ -52,3 +53,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx index 69036826432f..7a5dc34b6e8d 100644 --- a/extensions/source/oooimprovement/invite_job.cxx +++ b/extensions/source/oooimprovement/invite_job.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. * @@ -49,7 +50,7 @@ namespace // [add additional conditions here] static bool lcl_IsInvitationAllowed() { - static OUString sNoFirstStartWizard = OUString::createFromAscii("-nofirststartwizard"); + static OUString sNoFirstStartWizard(RTL_CONSTASCII_USTRINGPARAM("-nofirststartwizard")); sal_Int32 nCount = rtl_getAppCommandArgCount(); for(sal_Int32 nCurrent=0; nCurrent<nCount; nCurrent++) { @@ -64,12 +65,6 @@ namespace namespace oooimprovement { -// InviteJob::InviteJob(const Reference<XComponentContext>& context) -// : m_ServiceFactory(Reference<XMultiServiceFactory>( -// context->getServiceManager()->createInstanceWithContext( -// OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context), -// UNO_QUERY)) -// { } InviteJob::InviteJob(const Reference<XMultiServiceFactory>& sf) : m_ServiceFactory(sf) @@ -92,7 +87,7 @@ namespace oooimprovement if(lcl_IsInvitationAllowed() && !config.getShowedInvitation()) { Reference<XCore> core( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.Core")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core"))), UNO_QUERY); if(core.is()) core->inviteUser(); } @@ -116,18 +111,17 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL InviteJob::getImplementationName_static() - { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.InviteJob"); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.InviteJob")); } Sequence<OUString> SAL_CALL InviteJob::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.AsyncJob"); + aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.AsyncJob")); return aServiceNames; } -// Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context) -// { return *(new InviteJob(context)); } - Reference<XInterface> InviteJob::Create(const Reference<XMultiServiceFactory>& sm) { return *(new InviteJob(sm)); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/invite_job.hxx b/extensions/source/oooimprovement/invite_job.hxx index 8679f092065d..65981518657a 100644 --- a/extensions/source/oooimprovement/invite_job.hxx +++ b/extensions/source/oooimprovement/invite_job.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. * @@ -80,3 +81,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/logpacker.cxx b/extensions/source/oooimprovement/logpacker.cxx index 71508ab05bcb..e74b74c31982 100644 --- a/extensions/source/oooimprovement/logpacker.cxx +++ b/extensions/source/oooimprovement/logpacker.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. * @@ -73,13 +74,13 @@ namespace oooimprovement sal_Int32 LogPacker::pack(const OUString& fileurl) { Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); Reference<XStorage> storage; { Reference<XSingleServiceFactory> storage_factory( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.embed.StorageFactory")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), UNO_QUERY_THROW); Sequence<Any> storage_init_args(2); storage_init_args[0] = Any(getZipfileurl(fileurl)); @@ -90,7 +91,7 @@ namespace oooimprovement } Reference<XOutputStream> zipped_stream = storage->openStreamElement( - OUString::createFromAscii("logdata.csv"), + OUString(RTL_CONSTASCII_USTRINGPARAM("logdata.csv")), ElementModes::WRITE)->getOutputStream(); Reference<XInputStream> unzipped_stream = file_access->openFileRead(fileurl); const sal_Int32 bufsize = 1024; @@ -112,3 +113,5 @@ namespace oooimprovement return logged_events; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/logpacker.hxx b/extensions/source/oooimprovement/logpacker.hxx index 486443095d95..fdf08141ba03 100644 --- a/extensions/source/oooimprovement/logpacker.hxx +++ b/extensions/source/oooimprovement/logpacker.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. * @@ -49,3 +50,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/logstorage.cxx b/extensions/source/oooimprovement/logstorage.cxx index 7c337288460e..13edbdaa8241 100644 --- a/extensions/source/oooimprovement/logstorage.cxx +++ b/extensions/source/oooimprovement/logstorage.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. * @@ -46,7 +47,7 @@ namespace { using namespace oooimprovement; - static const OUString CSSU_PATHSUB = OUString::createFromAscii("com.sun.star.util.PathSubstitution"); + static const OUString CSSU_PATHSUB(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSubstitution")); static OUString getLogPathFromCfg(const Reference<XMultiServiceFactory>& sf) { @@ -62,14 +63,14 @@ namespace static bool isZipfile(const OUString& fileurl) { - static const OUString file_extension = OUString::createFromAscii(".zip"); + static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".zip")); return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()); }; static bool isLogfile(const OUString& fileurl) { - static const OUString file_extension = OUString::createFromAscii(".csv"); - static const OUString current = OUString::createFromAscii("Current.csv"); + static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".csv")); + static const OUString current(RTL_CONSTASCII_USTRINGPARAM("Current.csv")); return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()) && !fileurl.match(current, fileurl.getLength()-current.getLength()); @@ -83,7 +84,7 @@ namespace static Sequence<OUString> getAllLogStoragefiles(const Reference<XMultiServiceFactory>& sf) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); return file_access->getFolderContents( getLogPathFromCfg(sf), @@ -106,7 +107,7 @@ namespace static void assureLogStorageExists(const Reference<XMultiServiceFactory>& sf) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); OUString log_path(getLogPathFromCfg(sf)); if(!file_access->isFolder(log_path)) @@ -129,12 +130,12 @@ namespace oooimprovement void LogStorage::clear() { Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); vector<OUString> files_to_kill = getLogStoragefiles(m_ServiceFactory, &isZipOrLogFile); for(vector<OUString>::iterator item = files_to_kill.begin(); item != files_to_kill.end(); - item++) + ++item) file_access->kill(*item); } @@ -144,3 +145,5 @@ namespace oooimprovement const vector<OUString> LogStorage::getZippedLogFiles() const { return getLogStoragefiles(m_ServiceFactory, &isZipfile); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/logstorage.hxx b/extensions/source/oooimprovement/logstorage.hxx index 2def4f5eb72a..82dcdf331f59 100644 --- a/extensions/source/oooimprovement/logstorage.hxx +++ b/extensions/source/oooimprovement/logstorage.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. * @@ -53,3 +54,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/myconfigurationhelper.cxx b/extensions/source/oooimprovement/myconfigurationhelper.cxx index d563b547f2bc..b211fdb6756c 100644 --- a/extensions/source/oooimprovement/myconfigurationhelper.cxx +++ b/extensions/source/oooimprovement/myconfigurationhelper.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. @@ -73,28 +74,28 @@ namespace oooimprovement sal_Int32 eMode) { Reference<XMultiServiceFactory> xConfigProvider( - xSMGR->createInstance(OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + xSMGR->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), UNO_QUERY_THROW); vector<Any> lParams; css::beans::PropertyValue aParam; // set root path - aParam.Name = OUString::createFromAscii("nodepath"); + aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Value <<= sPackage; lParams.push_back(makeAny(aParam)); // enable all locales mode if ((eMode & MyConfigurationHelper::E_ALL_LOCALES)==MyConfigurationHelper::E_ALL_LOCALES) { - aParam.Name = OUString::createFromAscii("locale"); - aParam.Value <<= OUString::createFromAscii("*"); + aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("locale")); + aParam.Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("*")); lParams.push_back(makeAny(aParam)); } // enable lazy writing sal_Bool bLazy = ((eMode & MyConfigurationHelper::E_LAZY_WRITE)==MyConfigurationHelper::E_LAZY_WRITE); - aParam.Name = OUString::createFromAscii("lazywrite"); + aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")); aParam.Value = makeAny(bLazy); lParams.push_back(makeAny(aParam)); @@ -104,11 +105,11 @@ namespace oooimprovement sal_Bool bReadOnly = ((eMode & MyConfigurationHelper::E_READONLY)==MyConfigurationHelper::E_READONLY); if (bReadOnly) xCFG = xConfigProvider->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), sequenceFromVector(lParams)); else xCFG = xConfigProvider->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")), sequenceFromVector(lParams)); return xCFG; } @@ -176,3 +177,5 @@ namespace oooimprovement xBatch->commitChanges(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/myconfigurationhelper.hxx b/extensions/source/oooimprovement/myconfigurationhelper.hxx index d196f415dc33..619d8cf93e06 100644 --- a/extensions/source/oooimprovement/myconfigurationhelper.hxx +++ b/extensions/source/oooimprovement/myconfigurationhelper.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. @@ -212,3 +213,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx index e1f9cf717584..255a324702f6 100644 --- a/extensions/source/oooimprovement/onlogrotate_job.cxx +++ b/extensions/source/oooimprovement/onlogrotate_job.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. * @@ -79,7 +80,7 @@ namespace { Config config(sf); Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); SoapSender sender(sf, config.getSoapUrl()); OUString soap_id = config.getSoapId(); @@ -183,7 +184,7 @@ namespace oooimprovement OnLogRotateJob::OnLogRotateJob(const Reference<XComponentContext>& context) : m_ServiceFactory(Reference<XMultiServiceFactory>( context->getServiceManager()->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.XMultiServiceFactory")), context), UNO_QUERY)) { } @@ -223,12 +224,12 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL OnLogRotateJob::getImplementationName_static() - { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob"); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob")); } Sequence<OUString> SAL_CALL OnLogRotateJob::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.AsyncJob"); + aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.AsyncJob")); return aServiceNames; } @@ -238,3 +239,5 @@ namespace oooimprovement Reference<XInterface> OnLogRotateJob::Create(const Reference<XMultiServiceFactory>& sf) { return *(new OnLogRotateJob(sf)); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/onlogrotate_job.hxx b/extensions/source/oooimprovement/onlogrotate_job.hxx index 8fa902ad4c78..16e36530073c 100644 --- a/extensions/source/oooimprovement/onlogrotate_job.hxx +++ b/extensions/source/oooimprovement/onlogrotate_job.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. * @@ -81,3 +82,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/oooimprovement_exports.cxx b/extensions/source/oooimprovement/oooimprovement_exports.cxx index b351f84680d7..cba715bc192d 100644 --- a/extensions/source/oooimprovement/oooimprovement_exports.cxx +++ b/extensions/source/oooimprovement/oooimprovement_exports.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. * @@ -86,3 +87,5 @@ extern "C" return factory.get(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/soaprequest.cxx b/extensions/source/oooimprovement/soaprequest.cxx index ea1274bd18f6..d4b1c8a2d85b 100644 --- a/extensions/source/oooimprovement/soaprequest.cxx +++ b/extensions/source/oooimprovement/soaprequest.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. * @@ -115,7 +116,7 @@ namespace static void writeFile(const Reference<XMultiServiceFactory>& sf, const Reference<XOutputStream>& target, const OUString& fileurl) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY); Reference<XInputStream> file = file_access->openFileRead(fileurl); const sal_Int32 bufsize = 3; @@ -198,3 +199,5 @@ namespace oooimprovement writeString(target, SOAP_END); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/soaprequest.hxx b/extensions/source/oooimprovement/soaprequest.hxx index 9770093ac03c..313569a2c0d0 100644 --- a/extensions/source/oooimprovement/soaprequest.hxx +++ b/extensions/source/oooimprovement/soaprequest.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. * @@ -58,3 +59,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/soapsender.cxx b/extensions/source/oooimprovement/soapsender.cxx index 01d2af96c85d..8cb9c2e9104f 100644 --- a/extensions/source/oooimprovement/soapsender.cxx +++ b/extensions/source/oooimprovement/soapsender.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. * @@ -77,13 +78,13 @@ namespace oooimprovement void SoapSender::send(const SoapRequest& request) const { Reference<XTempFile> temp_file( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.io.TempFile")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile"))), UNO_QUERY_THROW); Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); Reference<XURLTransformer> url_trans( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.util.URLTransformer")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY_THROW); // writing request to tempfile @@ -108,7 +109,7 @@ namespace oooimprovement oslSocketResult result = socket->connect(addr); if(result != osl_Socket_Ok) throw RuntimeException( - OUString::createFromAscii("unable to connect to SOAP server"), + OUString(RTL_CONSTASCII_USTRINGPARAM("unable to connect to SOAP server")), Reference<XInterface>()); } @@ -120,7 +121,7 @@ namespace oooimprovement const OString header = getHttpPostHeader(path_on_server.makeStringAndClear(), file_access->getSize(temp_file->getUri())); if(socket->write(header.getStr(), header.getLength()) != static_cast<sal_Int32>(header.getLength())) throw RuntimeException( - OUString::createFromAscii("error while sending HTTP header"), + OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending HTTP header")), Reference<XInterface>()); } @@ -139,7 +140,7 @@ namespace oooimprovement buf2[idx] = buf[idx]; if(socket->write(buf2, bytes_read) != bytes_read) throw RuntimeException( - OUString::createFromAscii("error while sending SOAP request"), + OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending SOAP request")), Reference<XInterface>()); } while(bytes_read == bufsize); } @@ -153,8 +154,10 @@ namespace oooimprovement const sal_Int32 returncode_start = answer.indexOf(' '); if(returncode_start==-1 || !answer.copy(returncode_start, 4).equals(OString(" 200"))) throw RuntimeException( - OUString::createFromAscii("SOAP server returns a error"), + OUString(RTL_CONSTASCII_USTRINGPARAM("SOAP server returns a error")), Reference<XInterface>()); } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/oooimprovement/soapsender.hxx b/extensions/source/oooimprovement/soapsender.hxx index d826582bd0d7..b21cbe95e011 100644 --- a/extensions/source/oooimprovement/soapsender.hxx +++ b/extensions/source/oooimprovement/soapsender.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. * @@ -54,3 +55,5 @@ namespace oooimprovement #undef css } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx index e0bfe3ad5c01..3b6984502a5e 100644 --- a/extensions/source/plugin/aqua/macmgr.cxx +++ b/extensions/source/plugin/aqua/macmgr.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. @@ -32,11 +33,17 @@ #include "osl/file.h" #include "osl/module.hxx" -using namespace rtl; using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringBuffer; +using ::rtl::OStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; + namespace plugstringhelper { @@ -412,7 +419,7 @@ static bool checkBlackList( CFBundleRef i_xBundle ) bool bReject = false; // #i102735# VLC plugin prior to 1.0 tends to crash - if( aBundleName.equalsAscii( "VLC Plug-in" ) ) + if( aBundleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VLC Plug-in" ) ) ) { sal_Int32 nIndex = 0; rtl::OUString aMajor( aBundleVersion.getToken( 0, '.', nIndex ) ); @@ -422,7 +429,7 @@ static bool checkBlackList( CFBundleRef i_xBundle ) } } // #i103674# Garmin Communicator Plugin crashes - else if( aBundleName.equalsAscii( "Garmin Communicator Plugin" ) ) + else if( aBundleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Garmin Communicator Plugin" ) ) ) { bReject = true; } @@ -644,3 +651,4 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th return aDescriptions; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk index e29418a526f2..8d1aaa484d28 100644 --- a/extensions/source/plugin/aqua/makefile.mk +++ b/extensions/source/plugin/aqua/makefile.mk @@ -28,8 +28,6 @@ PRJ=..$/..$/.. PRJNAME=extensions TARGET=plaqua -#ENABLE_EXCEPTIONS=TRUE -#TARGETTYPE=CUI .INCLUDE : ..$/util$/makefile.pmk @@ -58,16 +56,6 @@ SLOFILES=\ $(SLO)$/macmgr.obj \ $(SLO)$/sysplug.obj -#APP1TARGET=pluginapp.bin -#APP1OBJS=$(OBJFILES) -#APP1STDLIBS=\ -# $(TOOLSLIB) \ -# $(VOSLIB) \ -# $(SALLIB) - -#APP1DEF= $(MISC)$/$(TARGET).def - - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx index 206204fa10a7..01e10ddc1f14 100644 --- a/extensions/source/plugin/aqua/sysplug.cxx +++ b/extensions/source/plugin/aqua/sysplug.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. @@ -37,9 +38,11 @@ extern NPNetscapeFuncs aNPNFuncs; #include <tools/debug.hxx> -using namespace rtl; using namespace plugstringhelper; +using ::rtl::OUString; +using ::rtl::OUStringToOString; + #if OSL_DEBUG_LEVEL > 1 void TRACE( char const * s ); void TRACEN( char const * s, long n ); @@ -485,11 +488,11 @@ long MacPluginComm::doIt() break; case eNPP_Initialize: TRACE( "eNPP_Initialize" ); - OSL_ENSURE( false, "NPP_Initialize: not implemented!" ); + OSL_FAIL( "NPP_Initialize: not implemented!" ); break; case eNPP_GetJavaClass: TRACE( "eNPP_GetJavaClass" ); - OSL_ENSURE( false, "NPP_GetJavaClass: not implemented!" ); + OSL_FAIL( "NPP_GetJavaClass: not implemented!" ); break; } return nRet; @@ -681,7 +684,7 @@ NPError MacPluginComm::NPP_SetValue( NPP instance, NPNVariable variable, void *s //-------------------------------------------------------------------------------------------------- void * MacPluginComm::NPP_GetJavaClass() { - DBG_ERROR( "no java class available!" ); + OSL_FAIL( "no java class available!" ); return 0; } @@ -806,3 +809,4 @@ void MacPluginComm::drawView( XPlugin_Impl* i_pImpl ) this->NPP_HandleEvent( i_pImpl->getNPPInstance(), &aRec ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 27266579148e..4881a610fe71 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.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. @@ -28,16 +29,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#if STLPORT_VERSION>=321 +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif + #include <cstdarg> #include <cstdio> -#endif #include <plugin/impl.hxx> -#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAGS_HPP_ #include <com/sun/star/frame/FrameSearchFlag.hpp> -#endif #include <com/sun/star/frame/XComponentLoader.hpp> #include <tools/fsys.hxx> #include <tools/urlobj.hxx> @@ -119,7 +122,7 @@ XPluginContext_Impl::~XPluginContext_Impl() void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); if( ! xInst.is() ) return; @@ -146,7 +149,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString::createFromAscii( "Referer" ); + aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); @@ -181,7 +184,7 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin ::rtl::OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - return ::rtl::OUString::createFromAscii( "Mozilla 3.0" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Mozilla 3.0")); } void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const ::rtl::OUString& /*message*/) @@ -212,7 +215,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl } } - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); if( ! xInst.is() ) return ; @@ -223,10 +226,10 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl try { ::com::sun::star::beans::PropertyValue aValues[2]; - aValues[0].Name = ::rtl::OUString::createFromAscii( "Referer" ); + aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); aValues[0].Value <<= pPlugin->getRefererURL(); - aValues[1].Name = ::rtl::OUString::createFromAscii( "PostString" ); + aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostString")); aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); Reference< ::com::sun::star::lang::XComponent > xComp = @@ -297,7 +300,7 @@ void FileSink::closeOutput() throw() if( fp ) fclose( fp ); - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); Reference< ::com::sun::star::frame::XComponentLoader > xLoader( xInst, UNO_QUERY ); XPlugin_Impl* pPlugin = XPluginManager_Impl::getPluginImplementation( m_xPlugin ); @@ -306,7 +309,7 @@ void FileSink::closeOutput() throw() try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString::createFromAscii( "Referer" ); + aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); @@ -341,3 +344,5 @@ void FileSink::flush() throw() if( fp ) fflush( fp ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx index fda829f99b72..4f1db5bd3e7e 100644 --- a/extensions/source/plugin/base/evtlstnr.cxx +++ b/extensions/source/plugin/base/evtlstnr.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. @@ -28,10 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#if STLPORT_VERSION>=321 -#include <cstdarg> +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT #endif +#include <cstdarg> + #include <plugin/impl.hxx> PluginEventListener::PluginEventListener( XPlugin_Impl* pPlugin, @@ -62,3 +67,5 @@ void PluginEventListener::disposing( const ::com::sun::star::lang::EventObject& NPRES_DONE, m_pNotifyData ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index c40f599aad23..a261177aafaa 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.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. @@ -28,10 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#if STLPORT_VERSION>=321 -#include <cstdarg> +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT #endif +#include <cstdarg> + #include "plugin/impl.hxx" #include "osl/mutex.hxx" @@ -122,7 +127,7 @@ Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames(void) Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ); + aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")); return aSNS; } @@ -223,3 +228,4 @@ Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugi return xRef; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx index 1957a9c19115..5f7f6a26719f 100644 --- a/extensions/source/plugin/base/multiplx.cxx +++ b/extensions/source/plugin/base/multiplx.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,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <plugin/multiplx.hxx> // --------------------------------------------------------------------- @@ -106,7 +107,7 @@ void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::st } else { - VOS_ENSHURE( sal_False, "unknown listener" ); + OSL_FAIL( "unknown listener" ); } } @@ -134,7 +135,7 @@ void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< ::com::sun } else { - VOS_ENSHURE( sal_False, "unknown listener" ); + OSL_FAIL( "unknown listener" ); } } @@ -330,3 +331,5 @@ void MRCListenerMultiplexerHelper::windowDeactivated( const ::com::sun::star::la { MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject ) } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index f4164fd71a46..24e9939cb2ad 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.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. @@ -28,10 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#if STLPORT_VERSION>=321 -#include <cstdarg> +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT #endif +#include <cstdarg> #include <list> #include <plugin/impl.hxx> @@ -80,9 +84,12 @@ void TRACES( char const* s, char const* s2 ) #define TRACES(x,s) #endif -using namespace rtl; using namespace com::sun::star::lang; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; + NPNetscapeFuncs aNPNFuncs = { sizeof( NPNetscapeFuncs ), @@ -576,23 +583,6 @@ NPError SAL_CALL NP_LOADDS NPN_GetValue( NPP instance, NPNVariable variable, vo *(NPBool*)value = false; break; } - /* - provisional code should there ever be NPNVariables that we actually - want to query from the PluginContext - ::rtl::OUString aValue; - try - { - pImpl->enterPluginCallback(); - aValue = pImpl->getPluginContext()-> - getValue( pImpl, (::com::sun::star::plugin::PluginVariable)variable ); - pImpl->leavePluginCallback(); - } - catch( ::com::sun::star::plugin::PluginException& e ) - { - pImpl->leavePluginCallback(); - return e.ErrorCode; - } - */ return aResult; } @@ -675,3 +665,5 @@ void SAL_CALL NP_LOADDS NPN_ForceRedraw(NPP instance) } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx index 09b4f1913d13..1b4c9fbcb312 100644 --- a/extensions/source/plugin/base/plcom.cxx +++ b/extensions/source/plugin/base/plcom.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. @@ -28,13 +29,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif + #ifdef SOLARIS #include <limits> #endif -#if STLPORT_VERSION>=321 #include <cstdarg> -#endif #include <tools/fsys.hxx> #include <plugin/impl.hxx> @@ -69,3 +74,4 @@ NPError PluginComm::NPP_Destroy( XPlugin_Impl* i_pImpl, NPSavedData** save ) return NPP_Destroy( i_pImpl->getNPPInstance(), save ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index cad58711b394..dba569c1a1db 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.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. @@ -161,7 +162,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo { if (_xPeer.is()) { - DBG_ERROR( "### Peer is already set!" ); + OSL_FAIL( "### Peer is already set!" ); return; } @@ -189,7 +190,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo } else { - DBG_ERROR( "### cannot get implementation of parent peer!" ); + OSL_FAIL( "### cannot get implementation of parent peer!" ); } getMultiplexer()->setPeer( _xPeerWindow ); @@ -321,3 +322,4 @@ void PluginControl_Impl::focusLost( const ::com::sun::star::awt::FocusEvent & /* { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 7e14ecd45d70..775e25bd07ff 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.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. @@ -57,7 +58,7 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw() { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" ); + aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel")); return aSNS; } @@ -189,7 +190,7 @@ void PluginModel::dispose(void) throw() // ::com::sun::star::io::XPersistObject ::rtl::OUString PluginModel::getServiceName() throw() { - return ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel")); } void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw() @@ -201,3 +202,5 @@ void PluginModel::read(const Reference< ::com::sun::star::io::XObjectInputStream { m_aCreationURL = InStream->readUTF(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index 21389caa2bbd..ac32608be0b9 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.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. @@ -28,10 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#if STLPORT_VERSION>=321 -#include <cstdarg> +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT #endif +#include <cstdarg> + #include <plugin/impl.hxx> #include <tools/debug.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -91,3 +96,5 @@ extern "C" { return pRet; } } /* extern "C" */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index b031df45e2af..38039f4fa7f9 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.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,6 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/loader/XImplementationLoader.hpp> @@ -38,7 +44,7 @@ #include <tools/urlobj.hxx> #include <tools/string.hxx> #include <vcl/svapp.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <osl/file.hxx> #ifdef UNX @@ -54,10 +60,12 @@ using namespace com::sun::star; using namespace com::sun::star::io; using namespace com::sun::star::beans; using namespace com::sun::star::plugin; -using namespace rtl; using namespace osl; -class PluginDisposer : public vos::OTimer +using ::rtl::OUString; +using ::rtl::OString; + +class PluginDisposer : public salhelper::Timer { private: XPlugin_Impl* m_pPlugin; @@ -65,8 +73,8 @@ private: virtual void SAL_CALL onShot(); public: PluginDisposer( XPlugin_Impl* pPlugin ) : - OTimer( vos::TTimeValue( 2, 0 ), - vos::TTimeValue( 2, 0 ) ), + salhelper::Timer( salhelper::TTimeValue( 2, 0 ), + salhelper::TTimeValue( 2, 0 ) ), m_pPlugin( pPlugin ) { start(); } ~PluginDisposer() {} @@ -455,7 +463,7 @@ OUString XPlugin_Impl::getCreationURL() uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { - Any aValue = xPS->getPropertyValue( OUString::createFromAscii( "URL" ) ); + Any aValue = xPS->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ); aValue >>= aRet; } return aRet; @@ -542,7 +550,7 @@ void XPlugin_Impl::loadPlugin() return; } - NPError aError = getPluginComm()-> + getPluginComm()-> NPP_New( (char*)OUStringToOString( m_aDescription.Mimetype, m_aEncoding).getStr(), getNPPInstance(), @@ -589,7 +597,7 @@ void XPlugin_Impl::loadPlugin() m_aNPWindow.width = aPosSize.Width ? aPosSize.Width : 600; m_aNPWindow.height = aPosSize.Height ? aPosSize.Height : 600; - aError = getPluginComm()->NPP_SetWindow( this ); + getPluginComm()->NPP_SetWindow( this ); } void XPlugin_Impl::destroyStreams() @@ -643,9 +651,9 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, { try { - xPS->setPropertyValue( OUString::createFromAscii( "URL" ), aAny ); + xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")), aAny ); aAny <<= mimetype; - xPS->setPropertyValue( OUString::createFromAscii( "TYPE" ), aAny ); + xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny ); } catch(...) { @@ -707,7 +715,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, { Any aAny; aAny <<= m_aDescription.Mimetype; - xPS->setPropertyValue( OUString::createFromAscii( "TYPE" ), aAny ); + xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny ); } catch(...) { @@ -717,22 +725,8 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, // there may be plugins that can use the file length information, // but currently none are known. Since this file opening/seeking/closing - // is rather costly, it is #if'ed out. If there are plugins known to + // is rather costly, it is not implemented. If there are plugins known to // make use of the file length, simply put it in -#if 0 - if( isfile && ! length ) - { - osl::File aFile( url ); - if( aFile.open( OpenFlag_Read ) == FileBase::E_None ) - { - aFile.setPos( Pos_End, 0 ); - sal_uInt64 nPos = 0; - if( aFile.getPos( nPos ) == FileBase::E_None ) - length = nPos; - aFile.close(); - } - } -#endif PluginInputStream* pStream = new PluginInputStream( this, aURL.getStr(), length, lastmodified ); @@ -884,7 +878,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, PluginDescription XPlugin_Impl::fitDescription( const OUString& rURL ) { - uno::Reference< XPluginManager > xPMgr( m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), UNO_QUERY ); + uno::Reference< XPluginManager > xPMgr( m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), UNO_QUERY ); if( !xPMgr.is() ) { m_nProvidingState = PROVIDING_NONE; @@ -990,7 +984,7 @@ PluginInputStream::~PluginInputStream() { ByteString aFileName( aFile, m_pPlugin->getTextEncoding() ); if( m_pPlugin->getPluginComm() && m_nMode != -1 ) - // mode -1 means either an error occured, + // mode -1 means either an error occurred, // or the plugin is already disposing { m_pPlugin->getPluginComm()->addFileToDelete( aFile ); @@ -1134,7 +1128,7 @@ PluginOutputStream::PluginOutputStream( XPlugin_Impl* pPlugin, sal_uInt32 len, sal_uInt32 lastmod ) : PluginStream( pPlugin, url, len, lastmod ), - m_xStream( pPlugin->getServiceManager()->createInstance( OUString::createFromAscii( "com.sun.star.io.DataOutputStream" ) ), UNO_QUERY ) + m_xStream( pPlugin->getServiceManager()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) ), UNO_QUERY ) { Guard< Mutex > aGuard( m_pPlugin->getMutex() ); @@ -1153,3 +1147,4 @@ PluginStreamType PluginOutputStream::getStreamType() return OutputStream; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx index bd4fc5405822..53f137e0c236 100644 --- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.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. @@ -165,3 +166,4 @@ struct SysPlugData #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 9b91c2fdeef1..75c8cd55922e 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.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. @@ -307,7 +308,7 @@ public: static rtl::OUString getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString::createFromAscii( "com.sun.star.extensions.PluginManager" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.extensions.PluginManager" )); } }; Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); @@ -428,3 +429,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index 9f9ac01f0ac3..f0acad737e14 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.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. @@ -104,7 +105,7 @@ class PluginModel : public BroadcasterHelperHolder, static rtl::OUString SAL_CALL getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ - return rtl::OUString::createFromAscii( "com.sun.star.extensions.PluginModel" ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.extensions.PluginModel" )); } // OPropertySetHelper @@ -134,3 +135,5 @@ class PluginModel : public BroadcasterHelperHolder, Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); #endif // __PLUGIN_MODEL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx index 45b60c12313d..27c29785721f 100644 --- a/extensions/source/plugin/inc/plugin/multiplx.hxx +++ b/extensions/source/plugin/inc/plugin/multiplx.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. @@ -165,3 +166,4 @@ private: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx index f0c4d54c02c3..b23fc6c6ada9 100644 --- a/extensions/source/plugin/inc/plugin/plcom.hxx +++ b/extensions/source/plugin/inc/plugin/plcom.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. @@ -83,3 +84,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx index 1980fa7b6725..d38cc7c01ed2 100644 --- a/extensions/source/plugin/inc/plugin/plctrl.hxx +++ b/extensions/source/plugin/inc/plugin/plctrl.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. @@ -81,7 +82,6 @@ public: { return _xContext; } virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( ::com::sun::star::uno::RuntimeException ) = 0; -// { DBG_ERROR( "### setModel() illegal on plugincontrol!" ); return sal_False; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( ::com::sun::star::uno::RuntimeException ) @@ -179,3 +179,4 @@ protected: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index ea068410d13e..72c0e3e82d3d 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.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. @@ -31,10 +32,10 @@ #include <stdarg.h> #include <tools/string.hxx> #include <tools/link.hxx> -#include <vos/pipe.hxx> -#include <vos/mutex.hxx> -#include <vos/conditn.hxx> -#include <vos/thread.hxx> +#include <osl/pipe.hxx> +#include <osl/mutex.hxx> +#include <osl/conditn.hxx> +#include <osl/thread.hxx> #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif @@ -90,10 +91,10 @@ protected: int m_nSocket; std::vector<MediatorMessage*> m_aMessageQueue; - vos::OMutex m_aQueueMutex; - vos::OMutex m_aSendMutex; + osl::Mutex m_aQueueMutex; + osl::Mutex m_aSendMutex; // only one thread can send a message at any given time - vos::OCondition m_aNewMessageCdtn; + osl::Condition m_aNewMessageCdtn; MediatorListener* m_pListener; // thread to fill the queue @@ -150,12 +151,12 @@ public: } }; -class MediatorListener : public vos:: OThread +class MediatorListener : public osl::Thread { friend class Mediator; private: Mediator* m_pMediator; - ::vos::OMutex m_aMutex; + ::osl::Mutex m_aMutex; MediatorListener( Mediator* ); ~MediatorListener(); @@ -181,3 +182,5 @@ inline void medDebug( int condition, const char* pFormat, ... ) } #endif // _MEDIATOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index d333d994e111..2b8bf4f7a89d 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.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. @@ -35,7 +36,7 @@ #include <plugin/unx/mediator.hxx> #if defined SOLARIS -#define USE_MOTIF +# define USE_MOTIF #endif #define Window XLIB_Window @@ -80,7 +81,7 @@ extern "C" { //https://bugzilla.mozilla.org/show_bug.cgi?id=241262 #ifdef UNIX # ifndef _UINT32 -# if defined(__alpha) || defined(__LP64__) +# if defined(__alpha) || defined(__LP64__) || defined(AIX) typedef unsigned int uint32; # else /* __alpha */ typedef unsigned long uint32; @@ -88,7 +89,7 @@ extern "C" { # define _UINT32 # endif # ifndef _INT32 -# if defined(__alpha) || defined(__LP64__) +# if defined(__alpha) || defined(__LP64__) || defined(AIX) typedef int int32; # else /* __alpha */ typedef long int32; @@ -166,7 +167,7 @@ public: class PluginConnector : public Mediator { protected: - vos::OMutex m_aUserEventMutex; + osl::Mutex m_aUserEventMutex; static std::vector<PluginConnector*> allConnectors; @@ -249,3 +250,5 @@ const char* GetCommandName( CommandAtoms ); #define POST_STRING( x ) x ? x : const_cast<char*>(""), x ? strlen(x) : 1 #endif // _PLUGCON_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx index 70b01d3fc69c..df44c149e30a 100644 --- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/unx/sysplug.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. @@ -81,3 +82,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx index 9dd25d34dd06..c90c816e45d3 100644 --- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/win/sysplug.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. @@ -31,13 +32,9 @@ #pragma warning (push,1) #pragma warning (disable:4005) -#include <tools/prewin.h> - -#include <windows.h> +#include <prewin.h> #include <tchar.h> -#include <winbase.h> - -#include <tools/postwin.h> +#include <postwin.h> #pragma pack( push, 8 ) #include <npsdk/npapi.h> @@ -123,3 +120,4 @@ private: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk index 669aaa556e62..7ed18c291a4c 100644 --- a/extensions/source/plugin/unx/makefile.mk +++ b/extensions/source/plugin/unx/makefile.mk @@ -69,17 +69,18 @@ OBJFILES=\ APP1TARGET=pluginapp.bin APP1OBJS=$(OBJFILES) -APP1STDLIBS=\ - $(VOSLIB) \ - $(SALLIB) -.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX" +APP1STDLIBS= $(SALLIB) + +.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl .ELSE .IF "$(DISABLE_XAW)" != "TRUE" APP1STDLIBS+=-lXaw .ENDIF -.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" +.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY" APP1STDLIBS+= -lXt -lXext -lX11 +.ELIF "$(OS)"=="AIX" +APP1STDLIBS+= -lXpm -lXmu -lXt $(X11LINK_DYNAMIC) -ldl .ELSE APP1STDLIBS+= -lXt $(X11LINK_DYNAMIC) -ldl .ENDIF @@ -96,7 +97,7 @@ DIRECT :=-z nodefs $(DIRECT) .ENDIF .ENDIF # "$(PKGCONFIG_ROOT)"!="" .ENDIF - + APP1DEF= $(MISC)$/$(TARGET).def diff --git a/extensions/source/plugin/unx/mediator.cxx b/extensions/source/plugin/unx/mediator.cxx index 4d8fd64a8407..df73c01f7e5e 100644 --- a/extensions/source/plugin/unx/mediator.cxx +++ b/extensions/source/plugin/unx/mediator.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. @@ -50,7 +51,7 @@ Mediator::~Mediator() if( m_pListener ) { { - ::vos::OGuard aGuard( m_pListener->m_aMutex ); + ::osl::MutexGuard aGuard( m_pListener->m_aMutex ); m_pListener->m_pMediator = NULL; } m_pListener = NULL; @@ -80,7 +81,7 @@ sal_uLong Mediator::SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong if( ! m_pListener ) return 0; - vos::OGuard aGuard( m_aSendMutex ); + osl::MutexGuard aGuard( m_aSendMutex ); if( ! nMessageID ) nMessageID = m_nCurrentID; @@ -132,7 +133,7 @@ MediatorMessage* Mediator::WaitForAnswer( sal_uLong nMessageID ) while( m_pListener ) { { - vos::OGuard aGuard( m_aQueueMutex ); + osl::MutexGuard aGuard( m_aQueueMutex ); for( size_t i = 0; i < m_aMessageQueue.size(); i++ ) { MediatorMessage* pMessage = m_aMessageQueue[ i ]; @@ -157,7 +158,7 @@ MediatorMessage* Mediator::GetNextMessage( sal_Bool bWait ) { // guard must be after WaitForMessage, else the listener // cannot insert a new one -> deadlock - vos::OGuard aGuard( m_aQueueMutex ); + osl::MutexGuard aGuard( m_aQueueMutex ); for( size_t i = 0; i < m_aMessageQueue.size(); i++ ) { MediatorMessage* pMessage = m_aMessageQueue[ i ]; @@ -205,9 +206,9 @@ void MediatorListener::run() char* pBuffer = new char[ nHeader[ 1 ] ]; if( m_pMediator && (sal_uLong)read( m_pMediator->m_nSocket, pBuffer, nHeader[ 1 ] ) == nHeader[ 1 ] ) { - ::vos::OGuard aMyGuard( m_aMutex ); + ::osl::MutexGuard aMyGuard( m_aMutex ); { - vos::OGuard + osl::MutexGuard aGuard( m_pMediator->m_aQueueMutex ); MediatorMessage* pMessage = new MediatorMessage( nHeader[ 0 ], nHeader[ 1 ], pBuffer ); @@ -307,3 +308,5 @@ sal_uInt32 MediatorMessage::GetUINT32() m_pRun += sizeof( sal_uInt32 ); return nRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx index 364ff05606bc..c0cefa35a556 100644 --- a/extensions/source/plugin/unx/npnapi.cxx +++ b/extensions/source/plugin/unx/npnapi.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,6 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" + +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif + #include <plugin/unx/plugcon.hxx> #include <unistd.h> @@ -332,27 +340,6 @@ static const char* l_NPN_UserAgent( NPP instance ) return pAgent; } -#if 0 -static void l_NPN_Version( int* major, int* minor, int* net_major, int* net_minor ) -{ - MediatorMessage* pMes = pConnector-> - Transact( eNPN_Version, - NULL ); - - if( ! pMes ) - return; - - *major = pMes->GetUINT32(); - *minor = pMes->GetUINT32(); - *net_major = pMes->GetUINT32(); - *net_minor = pMes->GetUINT32(); - - medDebug( 1, "pluginapp: NPN_Version: results %d %d, %d %d\n", *major, *minor, *net_major, *net_minor ); - - delete pMes; -} -#endif - static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffer ) { sal_uInt32 nFileID = pConnector->GetStreamID( stream ); @@ -717,7 +704,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) gtk_widget_show( pInst->pGtkWidget ); gtk_container_add( GTK_CONTAINER(pInst->pGtkWindow), pInst->pGtkWidget ); gtk_widget_show_all( pInst->pGtkWindow ); - pInst->window.window = (void *)gtk_socket_get_id( GTK_SOCKET(pInst->pGtkWidget ) ); + pInst->window.window = (void *)(sal_uIntPtr)gtk_socket_get_id( GTK_SOCKET(pInst->pGtkWidget ) ); XSync( pAppDisplay, False ); @@ -915,3 +902,4 @@ void LoadAdditionalLibs( const char* _pPluginLib ) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx index 640daba417ce..add518cd54fc 100644 --- a/extensions/source/plugin/unx/nppapi.cxx +++ b/extensions/source/plugin/unx/nppapi.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. @@ -28,10 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#if STLPORT_VERSION>=321 -#include <cstdarg> +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT #endif +#include <cstdarg> + #include <plugin/impl.hxx> #include <vcl/svapp.hxx> @@ -46,7 +51,7 @@ PluginConnector::PluginConnector( int nSocket ) : PluginConnector::~PluginConnector() { - vos::OGuard aGuard( m_aUserEventMutex ); + osl::MutexGuard aGuard( m_aUserEventMutex ); for( std::vector< PluginConnector* >::iterator it = allConnectors.begin(); it != allConnectors.end(); ++it ) { @@ -60,7 +65,7 @@ PluginConnector::~PluginConnector() IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ ) { - vos::OGuard aGuard( m_aUserEventMutex ); + osl::MutexGuard aGuard( m_aUserEventMutex ); bool bFound = false; for( std::vector< PluginConnector* >::iterator it = allConnectors.begin(); it != allConnectors.end() && bFound == false; ++it ) @@ -87,7 +92,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ ) return 0; /* { - vos::OGuard aGuard( m_aUserEventMutex ); + osl::MutexGuard aGuard( m_aUserEventMutex ); m_aUserEventIDs.pop_front(); } */ @@ -619,3 +624,5 @@ NPError UnxPluginComm::NPP_SetValue( NPP /*instance*/, NPNVariable /*variable*/, { return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx index 98bb858ecc0f..32daa95d512e 100644 --- a/extensions/source/plugin/unx/npwrap.cxx +++ b/extensions/source/plugin/unx/npwrap.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,6 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif #include <errno.h> #include <dlfcn.h> #include <unistd.h> @@ -209,7 +215,7 @@ static void signal_handler( int nSig ) fprintf( stderr, "caught signal %d, exiting\n", nSig ); #ifdef LINUX void* pStack[64]; - int nStackLevels = backtrace( pStack, sizeof(pStack)/sizeof(pStack[0]) ); + int nStackLevels = backtrace( pStack, SAL_N_ELEMENTS(pStack) ); backtrace_symbols_fd( pStack, nStackLevels, STDERR_FILENO ); #endif #endif @@ -513,3 +519,4 @@ extern "C" { } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx index c71738be3632..713154d87300 100644 --- a/extensions/source/plugin/unx/plugcon.cxx +++ b/extensions/source/plugin/unx/plugcon.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,6 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" + +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif + #include <plugin/unx/plugcon.hxx> #include <cstdarg> @@ -172,7 +180,7 @@ MediatorMessage* PluginConnector::WaitForAnswer( sal_uLong nMessageID ) while( m_pListener ) { { - vos::OGuard aGuard( m_aQueueMutex ); + osl::MutexGuard aGuard( m_aQueueMutex ); for( size_t i = 0; i < m_aMessageQueue.size(); i++ ) { MediatorMessage* pMessage = m_aMessageQueue[ i ]; @@ -280,3 +288,5 @@ const char* GetCommandName( CommandAtoms eCommand ) } return NULL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index e78ddf2322cf..018f7cf53f27 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.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,6 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" + +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif + #include <cstdarg> #include <sys/types.h> @@ -129,3 +137,5 @@ bool UnxPluginComm::getPluginappPath(rtl::OString * path) { (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index 5c02910ada33..742cb26f3498 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.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,6 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" + +#ifdef AIX +#define _LINUX_SOURCE_COMPAT +#include <sys/timer.h> +#undef _LINUX_SOURCE_COMPAT +#endif + #include <cstdarg> #include <sys/stat.h> #include <sys/types.h> @@ -38,11 +46,15 @@ #include <vcl/svapp.hxx> #include <plugin/impl.hxx> -using namespace rtl; using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OStringToOUString; + // Unix specific implementation static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rDescriptions ) { @@ -300,7 +312,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th // create return value aDescriptions = Sequence<PluginDescription>( aPlugins.size() ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "found %d plugins\n", aPlugins.size() ); + fprintf( stderr, "found %" SAL_PRI_SIZET "u plugins\n", aPlugins.size() ); #endif list<PluginDescription*>::iterator iter; for( iter = aPlugins.begin(), i=0; iter != aPlugins.end(); ++iter ,i++ ) @@ -313,3 +325,5 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th } return aDescriptions; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk index 765941689658..7b7d047a1779 100644 --- a/extensions/source/plugin/util/makefile.mk +++ b/extensions/source/plugin/util/makefile.mk @@ -73,25 +73,17 @@ DEF1NAME=$(SHL1TARGET) SHL1LIBS=$(LIB1TARGET) -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS= \ - $(LIBSTLPORT) \ - $(TKLIB) -.ELSE -SHL1STDLIBS= \ - $(TKLIB) -.ENDIF - SHL1STDLIBS+= \ + $(TKLIB) \ $(VCLLIB) \ $(SVLLIB) \ - $(UNOTOOLSLIB) \ + $(UNOTOOLSLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(SALLIB) + $(SALLIB) \ + $(SALHELPERLIB) .IF "$(GUIBASE)"=="unx" SHL1STDLIBS+=$(X11LINK_DYNAMIC) diff --git a/extensions/source/plugin/win/makefile.mk b/extensions/source/plugin/win/makefile.mk index 3167c22d135d..7f676ac16748 100644 --- a/extensions/source/plugin/win/makefile.mk +++ b/extensions/source/plugin/win/makefile.mk @@ -46,20 +46,13 @@ CDEFS+=-DOJI # --- Types ------------------------------------- .IF "$(WITH_MOZILLA)" != "NO" - -#UNOUCROUT=$(OUT)$/inc$/$(PRJNAME) -#INCPRE+=$(UNOUCROUT) - -# --- Types ------------------------------------- - SLOFILES = $(SLO)$/winmgr.obj \ $(SLO)$/sysplug.obj - .ENDIF # $(WITH_MOZILLA) != "NO" + .ENDIF # ------------------------------------------------------------------ - .INCLUDE : target.mk diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index 1d117f6927d5..a65ff1b5e766 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.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. @@ -33,16 +34,11 @@ #pragma warning (push,1) #pragma warning (disable:4005) - #include <tools/prewin.h> - - #include <windows.h> - #include <string.h> - #include <tchar.h> - #include <winreg.h> - #include <winbase.h> - #include <objbase.h> - - #include <tools/postwin.h> +#include <prewin.h> +#include <string.h> +#include <tchar.h> +#include <objbase.h> +#include <postwin.h> #pragma warning (pop) @@ -55,7 +51,9 @@ extern NPNetscapeFuncs aNPNFuncs; #include <tools/debug.hxx> -using namespace rtl; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; #if OSL_DEBUG_LEVEL > 1 void TRACE( char const * s ); @@ -273,11 +271,11 @@ long PluginComm_Impl::doIt() break; case eNPP_Initialize: TRACE( "eNPP_Initialize" ); - OSL_ENSURE( false, "NPP_Initialize: not implemented!" ); + OSL_FAIL( "NPP_Initialize: not implemented!" ); break; case eNPP_GetJavaClass: TRACE( "eNPP_GetJavaClass" ); - OSL_ENSURE( false, "NPP_GetJavaClass: not implemented!" ); + OSL_FAIL( "NPP_GetJavaClass: not implemented!" ); break; } return nRet; @@ -425,7 +423,7 @@ NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void //-------------------------------------------------------------------------------------------------- void * PluginComm_Impl::NPP_GetJavaClass() { - DBG_ERROR( "no java class available!" ); + OSL_FAIL( "no java class available!" ); return 0; } @@ -441,3 +439,5 @@ void PluginComm_Impl::NPP_Shutdown() m_eCall = eNPP_Shutdown; execute(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index e4a9d9732c24..23aa94464d02 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.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. @@ -42,16 +43,11 @@ #pragma warning (push,1) #pragma warning (disable:4005) - #include "tools/prewin.h" - - #include <windows.h> - #include <string.h> - #include <tchar.h> - #include <winreg.h> - #include <winbase.h> - #include <objbase.h> - - #include "tools/postwin.h" +#include <prewin.h> +#include <string.h> +#include <tchar.h> +#include <objbase.h> +#include <postwin.h> #pragma warning (pop) @@ -60,27 +56,17 @@ #include <algorithm> -using namespace rtl; using namespace std; using namespace osl; using namespace com::sun::star::uno; using namespace com::sun::star::plugin; -typedef map< OString, OUString, less< OString > > PluginLocationMap; - +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; +using ::rtl::OUStringToOString; -#if OSL_DEBUG_LEVEL > 1 -#include <stdio.h> - -static void logPlugin( OUString const & path_ ) -{ - static FILE * s_file = 0; - if (! s_file) - s_file = fopen( "d:\\plugins.log", "a+" ); - OString path( OUStringToOString( path_, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( s_file, "%s\n", path.getStr() ); -} -#endif +typedef map< OString, OUString, less< OString > > PluginLocationMap; //__________________________________________________________________________________________________ static void addPluginsFromPath( const TCHAR * pPluginsPath, PluginLocationMap & rPlugins ) @@ -125,9 +111,6 @@ static void addPluginsFromPath( const TCHAR * pPluginsPath, PluginLocationMap & OUString path( OStringToOUString( arComplete, RTL_TEXTENCODING_MS_1252 ) ); rPlugins[ aName ] = path; -#if OSL_DEBUG_LEVEL > 1 - logPlugin( path ); -#endif } if (! ::FindNextFile( hFind, &aFindData )) @@ -256,9 +239,6 @@ static void add_MozPlugin( HKEY hKey, PluginLocationMap & rPlugins ) rPlugins.find( aName ) == rPlugins.end()) { rPlugins[ aName ] = aUPath; -#if OSL_DEBUG_LEVEL > 1 - logPlugin( aUPath ); -#endif } } } @@ -421,7 +401,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo rDescr.Description = aComment; sal_Int32 nPos = 0, nLen = aExtToken.getLength(); - OUString aExtensions( OUString::createFromAscii( nLen ? "*." : "*.*" ) ); + OUString aExtensions = nLen ? OUString(RTL_CONSTASCII_USTRINGPARAM("*.")) : OUString(RTL_CONSTASCII_USTRINGPARAM("*.*")); for ( ; nPos < nLen; ++nPos ) { @@ -430,7 +410,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo { case ',': case ';': - aExtensions += OUString::createFromAscii( ";*." ); + aExtensions += OUString(RTL_CONSTASCII_USTRINGPARAM(";*.")); case ' ': break; case '*': @@ -455,7 +435,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo } #if OSL_DEBUG_LEVEL > 1 else - DBG_ERROR( "### cannot get MIME type or extensions!" ); + OSL_FAIL( "### cannot get MIME type or extensions!" ); #endif } if (pVersionData) @@ -468,3 +448,4 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/preload/modulepreload.cxx b/extensions/source/preload/modulepreload.cxx index 9f6d3d2b9e30..6fb06c7f68ac 100644 --- a/extensions/source/preload/modulepreload.cxx +++ b/extensions/source/preload/modulepreload.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. @@ -30,3 +31,4 @@ #include "componentmodule.cxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx index c3b7af8e7426..fe5704934df4 100644 --- a/extensions/source/preload/oemwiz.cxx +++ b/extensions/source/preload/oemwiz.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. @@ -35,12 +36,8 @@ #include <svl/itempool.hxx> #include <vcl/msgbox.hxx> #include <unotools/pathoptions.hxx> -#ifndef _EXTENSIONS_PRELOAD_PRELOAD_HRC_ #include "preload.hrc" -#endif -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <sfx2/app.hxx> #include <svtools/xtextedt.hxx> #include "osl/diagnose.h" @@ -77,9 +74,7 @@ namespace preload } void WriteUserData(); }; -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ OEMPreloadDialog_Impl::OEMPreloadDialog_Impl(OEMPreloadDialog* pDialog) { SfxItemPool& rPool = SFX_APP()->GetPool(); @@ -96,18 +91,13 @@ namespace preload pWelcomePage = new OEMWelcomeTabPage(pDialog); pLicensePage = new OEMLicenseTabPage(pDialog); } -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ void OEMPreloadDialog_Impl::WriteUserData() { if ( pUserDataPage ) ((SfxTabPage*)pUserDataPage)->FillItemSet(*pSet); } -/* -----------------------------14.11.2001 11:33------------------------------ - - ---------------------------------------------------------------------------*/ //===================================================================== //= OEMPreloadDialog //===================================================================== @@ -147,16 +137,12 @@ namespace preload SetPage( OEM_USERDATA, pImpl->pUserDataPage ); ShowPage( OEM_WELCOME ); } -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ OEMPreloadDialog::~OEMPreloadDialog( ) { delete pImpl; } -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(OEMPreloadDialog, NextPrevPageHdl, PushButton*, pButton) { if(pButton == &aPrevPB) @@ -194,9 +180,7 @@ namespace preload aPrevPB.Enable(GetCurLevel() != OEM_WELCOME); return 0; } -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ sal_Bool OEMPreloadDialog::LoadFromLocalFile(const String& rFileName, String& rContent) { SvtPathOptions aPathOpt; @@ -227,24 +211,17 @@ namespace preload aCancelPB.SetText(rText); } -/* -----------------------------13.11.2001 12:29------------------------------ - - ---------------------------------------------------------------------------*/ OEMWelcomeTabPage::OEMWelcomeTabPage(Window* pParent) : TabPage(pParent, ModuleRes(RID_TP_WELCOME)), aInfoFT(this, ModuleRes(FT_INFO)) { FreeResource(); } -/* -----------------------------13.11.2001 12:30------------------------------ - ---------------------------------------------------------------------------*/ OEMWelcomeTabPage::~OEMWelcomeTabPage() { } -/* -----------------------------13.11.2001 12:29------------------------------ - ---------------------------------------------------------------------------*/ OEMLicenseTabPage::OEMLicenseTabPage(OEMPreloadDialog* pParent) : TabPage(pParent, ModuleRes(RID_TP_LICENSE)), aLicenseML(this, ModuleRes(ML_LICENSE)), @@ -281,15 +258,11 @@ namespace preload aText.SearchAndReplaceAll( UniString::CreateFromAscii("%PAGEDOWN"), aPBPageDown.GetText() ); aInfo2FT.SetText( aText ); } -/* -----------------------------13.11.2001 12:30------------------------------ - ---------------------------------------------------------------------------*/ OEMLicenseTabPage::~OEMLicenseTabPage() { } -/* ---------------------------14.11.2001 11:24---------------------------- - -----------------------------------------------------------------------*/ void OEMLicenseTabPage::ActivatePage() { if(!aLicenseML.GetText().Len()) @@ -469,3 +442,4 @@ namespace preload //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx index 1f7ae953010b..b051eab9614f 100644 --- a/extensions/source/preload/oemwiz.hxx +++ b/extensions/source/preload/oemwiz.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. @@ -31,9 +32,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svtools/wizdlg.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/tabpage.hxx> #include <vcl/fixed.hxx> #include <svtools/svmedit.hxx> @@ -154,3 +153,4 @@ namespace preload #endif // _EXTENSIONS_PRELOAD_OEMWIZ_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/preload/preloadservices.cxx b/extensions/source/preload/preloadservices.cxx index c309fb60cfe2..3ce121c98a4f 100644 --- a/extensions/source/preload/preloadservices.cxx +++ b/extensions/source/preload/preloadservices.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. @@ -69,3 +70,4 @@ namespace preload } // namespace preload //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/preload/preloadservices.hxx b/extensions/source/preload/preloadservices.hxx index 5676b7db543b..f4ef0c2500dc 100644 --- a/extensions/source/preload/preloadservices.hxx +++ b/extensions/source/preload/preloadservices.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. @@ -53,3 +54,4 @@ namespace preload #endif // _EXTENSIONS_PRELOAD_PRELOADSERVICES_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/preload/services.cxx b/extensions/source/preload/services.cxx index e063789e0f0c..5550786b6493 100644 --- a/extensions/source/preload/services.cxx +++ b/extensions/source/preload/services.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. @@ -84,3 +85,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( return xRet.get(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/preload/unoautopilot.hxx b/extensions/source/preload/unoautopilot.hxx index e6175a3f522e..8533736e0e6a 100644 --- a/extensions/source/preload/unoautopilot.hxx +++ b/extensions/source/preload/unoautopilot.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. @@ -105,3 +106,4 @@ namespace preload #endif // _EXTENSIONS_PRELOAD_UNOAUTOPILOT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/preload/unoautopilot.inl b/extensions/source/preload/unoautopilot.inl index 27acdd6864f3..317dbd298620 100644 --- a/extensions/source/preload/unoautopilot.inl +++ b/extensions/source/preload/unoautopilot.inl @@ -28,14 +28,9 @@ // no include protecttion // this file is included from unoautopilot.hxx directly -//using namespace ::com::sun::star::uno; -//using namespace ::com::sun::star::lang; -//using namespace ::com::sun::star::beans; -// //===================================================================== //= OUnoAutoPilot //===================================================================== -//--------------------------------------------------------------------- template <class TYPE, class SERVICEINFO> OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) :OUnoAutoPilot_Base(_rxORB) diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index dfd695999048..2b77ee5833fa 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.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. @@ -73,7 +74,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.MasterDetailLinkDialog")); } //--------------------------------------------------------------------- @@ -86,7 +87,7 @@ namespace pcr ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.MasterDetailLinkDialog"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.MasterDetailLinkDialog")); return aSupported; } @@ -155,3 +156,5 @@ namespace pcr //............................................................................ } // namespace pcr //............................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 4fa32628ef66..d0b68fc18e2a 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.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. @@ -82,3 +83,5 @@ namespace pcr } // namespace pcr //........................................................................ #endif // PROPCTRLR_MASTERDETAILLINKDIALOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index e67e466c5d24..e337bc6fe146 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.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. @@ -412,7 +413,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ) + void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ) { try { @@ -424,24 +425,7 @@ namespace pcr aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); - _out_rImage = _out_rHCImage = Image( xGraphic ); - - // see if we find an HC version beside the normal graphic - INetURLObject aURL( _rImageURL ); - ::rtl::OUString sBaseName( aURL.getBase() ); - aURL.setBase( sBaseName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_hc" ) ) ); - ::rtl::OUString sHCImageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - - Reference< XGraphic > xHCGraphic; - try - { - aMediaProperties[0].Value <<= sHCImageURL; - xHCGraphic = xGraphicProvider->queryGraphic( aMediaProperties ); - } - catch( const Exception& ) { } - - if ( xHCGraphic.is() ) - _out_rHCImage = Image( xHCGraphic ); + _out_rImage = Image( xGraphic ); } catch( const Exception& ) { @@ -455,12 +439,11 @@ namespace pcr PushButton& rButton( impl_ensureButton( _bPrimary ) ); OSL_PRECOND( _rImageURL.getLength(), "OBrowserLine::ShowBrowseButton: use the other version if you don't have an image!" ); - Image aImage, aHCImage; - impl_getImagesFromURL_nothrow( _rImageURL, aImage, aHCImage ); + Image aImage; + impl_getImagesFromURL_nothrow( _rImageURL, aImage ); - rButton.SetModeImage( aImage, BMP_COLOR_NORMAL ); - rButton.SetModeImage( aHCImage, BMP_COLOR_HIGHCONTRAST ); - } + rButton.SetModeImage( aImage ); + } //------------------------------------------------------------------ void OBrowserLine::ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary ) @@ -546,3 +529,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index ac65993c0e12..0f0b2f30a81a 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.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. @@ -32,9 +33,7 @@ #include <com/sun/star/inspection/XPropertyControl.hpp> /** === end UNO includes === **/ #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif namespace com { namespace sun { namespace star { namespace inspection { namespace PropertyLineElement { @@ -80,7 +79,7 @@ namespace pcr ~OBrowserLine(); void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& getControl() + const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& getControl() const { return m_xControl; } @@ -132,7 +131,7 @@ namespace pcr void impl_layoutComponents(); PushButton& impl_ensureButton( bool _bPrimary ); - void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ); + void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ); }; //............................................................................ @@ -141,3 +140,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 8682d9e701bb..ce558559b21f 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "browserlistbox.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif #include "proplinelistener.hxx" #include "propcontrolobserver.hxx" #include "linedescriptor.hxx" @@ -46,7 +45,7 @@ #include <comphelper/asyncnotification.hxx> #include <cppuhelper/implbase1.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //............................................................................ namespace pcr @@ -245,7 +244,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::dispose() { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( impl_isDisposed_nothrow() ) return; @@ -256,7 +255,7 @@ namespace pcr //-------------------------------------------------------------------- void PropertyControlContext_Impl::setNotificationMode( NotifcationMode _eMode ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; m_eMode = _eMode; } @@ -266,7 +265,7 @@ namespace pcr ::comphelper::AnyEventRef pEvent; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; impl_checkAlive_throw(); pEvent = new ControlEvent( _rxControl, _eType ); @@ -283,21 +282,21 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException) { - DBG_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" ); + OSL_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" ); impl_notify_throw( Control, FOCUS_GAINED ); } //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException) { - DBG_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" ); + OSL_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" ); impl_notify_throw( Control, VALUE_CHANGED ); } //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException) { - DBG_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" ); + OSL_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" ); impl_notify_throw( CurrentControl, ACTIVATE_NEXT ); } @@ -316,7 +315,7 @@ namespace pcr //-------------------------------------------------------------------- void PropertyControlContext_Impl::processEvent( const ::comphelper::AnyEvent& _rEvent ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( impl_isDisposed_nothrow() ) return; @@ -339,15 +338,15 @@ namespace pcr switch ( rControlEvent.eType ) { case FOCUS_GAINED: - DBG_TRACE( "PropertyControlContext_Impl::processEvent: FOCUS_GAINED" ); + OSL_TRACE( "PropertyControlContext_Impl::processEvent: FOCUS_GAINED" ); m_pContext->focusGained( rControlEvent.xControl ); break; case VALUE_CHANGED: - DBG_TRACE( "PropertyControlContext_Impl::processEvent: VALUE_CHANGED" ); + OSL_TRACE( "PropertyControlContext_Impl::processEvent: VALUE_CHANGED" ); m_pContext->valueChanged( rControlEvent.xControl ); break; case ACTIVATE_NEXT: - DBG_TRACE( "PropertyControlContext_Impl::processEvent: ACTIVATE_NEXT" ); + OSL_TRACE( "PropertyControlContext_Impl::processEvent: ACTIVATE_NEXT" ); m_pContext->activateNextControl( rControlEvent.xControl ); break; } @@ -394,7 +393,6 @@ namespace pcr // doing the commit here, while we, as well as our owner, as well as some other components, // are already "half dead" (means within their dtor) is potentially dangerous. // By definition, CommitModified has to be called (if necessary) before destruction - // #105868# - 2002-12-13 - fs@openoffice.org m_pControlContextImpl->dispose(); m_pControlContextImpl.clear(); @@ -422,7 +420,7 @@ namespace pcr if ( IsModified() && m_xActiveControl.is() ) { // for the time of this commit, notify all events synchronously - // #i63814# / 2006-03-31 / frank.schoenheit@sun.com + // #i63814# m_pControlContextImpl->setNotificationMode( PropertyControlContext_Impl::eSynchronously ); try { @@ -921,7 +919,7 @@ namespace pcr ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( "')!" ); - DBG_ERROR( sMessage ); + OSL_FAIL( sMessage.getStr() ); } #endif if ( _rLine.xHandler.is() ) @@ -952,7 +950,7 @@ namespace pcr ::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() ); sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( "')!" ); - DBG_ERROR( sMessage ); + OSL_FAIL( sMessage.getStr() ); } #endif if ( _rLine.xHandler.is() ) @@ -976,7 +974,7 @@ namespace pcr ) if ( (*search)->second.pLine->getControl().get() == _rxControl.get() ) return sal_uInt16( search - m_aOrderedLines.begin() ); - DBG_ERROR( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" ); + OSL_FAIL( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" ); return (sal_uInt16)-1; } @@ -1266,7 +1264,7 @@ namespace pcr m_aOrderedLines[ nFocusControlPos ]->second.pLine->GrabFocus(); } else - OSL_ENSURE( false, "OBrowserListBox::PreNotify: internal error, invalid focus control position!" ); + OSL_FAIL( "OBrowserListBox::PreNotify: internal error, invalid focus control position!" ); } } @@ -1310,3 +1308,4 @@ namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index edd9d9bd40eb..3f6e4c995e52 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.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. @@ -29,9 +30,7 @@ #define _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_ #include "browserline.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "pcrcommon.hxx" /** === begin UNO includes === **/ @@ -40,15 +39,13 @@ /** === end UNO includes === **/ #include <vcl/scrbar.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <tools/link.hxx> #include <rtl/ref.hxx> #include <set> #include <vector> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> //............................................................................ @@ -79,7 +76,7 @@ namespace pcr { } }; - typedef ::std::hash_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; + typedef ::boost::unordered_map< ::rtl::OUString, ListBoxLine, ::rtl::OUStringHash > ListBoxLines; typedef ::std::vector< ListBoxLines::iterator > OrderedListBoxLines; //======================================================================== @@ -248,3 +245,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index 131a3587a038..c65e3e3936db 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.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. @@ -103,3 +104,4 @@ namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index e8c2ee81692e..a77cfb76e9e9 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.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. @@ -66,3 +67,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_BROWSERPAGE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index a023c5ef6b01..be772262cd48 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.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. @@ -113,7 +114,7 @@ namespace pcr if ( ( KEY_DELETE == nKey ) || ( KEY_BACKSPACE == nKey ) ) // silence this, we don't want to propagate this outside the property // browser, as it will probably do harm there - // #i63285# / 2006-12-06 / frank.schoenheit@sun.com + // #i63285# return 1; } return Window::Notify( _rNEvt ); @@ -142,3 +143,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 8b0ecda6a28f..c08fba0e5fb9 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.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. @@ -32,7 +33,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/window.hxx> #include <tools/resid.hxx> -// #95343# -------------------- #include <com/sun/star/awt/Size.hpp> //............................................................................ @@ -73,7 +73,6 @@ namespace pcr void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; } Link getPageActivationHandler() const { return m_aPageActivationHandler; } - // #95343# ------------------ ::com::sun::star::awt::Size getMinimumSize(); protected: @@ -87,3 +86,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_BROWSERVIEW_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index 7dfcecc76f44..914ba8163870 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.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. @@ -120,7 +121,7 @@ namespace pcr break; default: - DBG_ERROR( "ButtonNavigationHandler::getPropertyState: cannot handle this property!" ); + OSL_FAIL( "ButtonNavigationHandler::getPropertyState: cannot handle this property!" ); break; } @@ -151,7 +152,7 @@ namespace pcr break; default: - DBG_ERROR( "ButtonNavigationHandler::getPropertyValue: cannot handle this property!" ); + OSL_FAIL( "ButtonNavigationHandler::getPropertyValue: cannot handle this property!" ); break; } @@ -180,7 +181,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "ButtonNavigationHandler::setPropertyValue: cannot handle this id!" ); + OSL_FAIL( "ButtonNavigationHandler::setPropertyValue: cannot handle this id!" ); } } @@ -264,7 +265,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "ButtonNavigationHandler::actuatingPropertyChanged: cannot handle this id!" ); + OSL_FAIL( "ButtonNavigationHandler::actuatingPropertyChanged: cannot handle this id!" ); } } @@ -293,3 +294,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index 63ad3e4cafef..f703e010e8e5 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.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. @@ -88,3 +89,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_BUTTONNAVIGATIONHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index c9630871ce3e..23b061844a8c 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.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. @@ -174,7 +175,7 @@ namespace pcr aDependentProperties.push_back( PROPERTY_ID_BOUNDCOLUMN ); // also reset the list entries if the cell range is reset - // #i28319# - 2004-04-27 - fs@openoffice.org + // #i28319# if ( !_bFirstTimeInit ) { try @@ -184,7 +185,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::actuatingPropertyChanged( ListCellRange ): caught an exception while resetting the string items!" ); + OSL_FAIL( "OPropertyBrowserController::actuatingPropertyChanged( ListCellRange ): caught an exception while resetting the string items!" ); } } } @@ -201,7 +202,7 @@ namespace pcr break; // case PROPERTY_ID_CONTROLSOURCE default: - DBG_ERROR( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); + OSL_FAIL( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); } for ( ::std::vector< PropertyId >::const_iterator loopAffected = aDependentProperties.begin(); @@ -237,7 +238,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" ); + OSL_FAIL( "CellBindingPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" ); } } @@ -281,7 +282,7 @@ namespace pcr break; default: - DBG_ERROR( "CellBindingPropertyHandler::getPropertyValue: cannot handle this!" ); + OSL_FAIL( "CellBindingPropertyHandler::getPropertyValue: cannot handle this!" ); break; } return aReturn; @@ -341,7 +342,7 @@ namespace pcr break; default: - DBG_ERROR( "CellBindingPropertyHandler::setPropertyValue: cannot handle this!" ); + OSL_FAIL( "CellBindingPropertyHandler::setPropertyValue: cannot handle this!" ); break; } @@ -355,7 +356,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingPropertyHandler::setPropertyValue: caught an exception!" ); + OSL_FAIL( "CellBindingPropertyHandler::setPropertyValue: caught an exception!" ); } } @@ -400,7 +401,7 @@ namespace pcr break; default: - DBG_ERROR( "CellBindingPropertyHandler::convertToPropertyValue: cannot handle this!" ); + OSL_FAIL( "CellBindingPropertyHandler::convertToPropertyValue: cannot handle this!" ); break; } @@ -455,7 +456,7 @@ namespace pcr break; default: - DBG_ERROR( "CellBindingPropertyHandler::convertToControlValue: cannot handle this!" ); + OSL_FAIL( "CellBindingPropertyHandler::convertToControlValue: cannot handle this!" ); break; } @@ -502,3 +503,5 @@ namespace pcr //........................................................................ } // namespace pcr //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index 608ed5f426b6..8d6d60d83f69 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.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. @@ -107,3 +108,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index cf71793f2745..8c42d311e162 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.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. @@ -197,7 +198,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::doConvertAddressRepresentations: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::doConvertAddressRepresentations: caught an exception!" ); } } @@ -296,7 +297,7 @@ namespace pcr } catch ( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::createDocumentDependentInstance: could not create the binding at the document!" ); + OSL_FAIL( "CellBindingHelper::createDocumentDependentInstance: could not create the binding at the document!" ); } } return xReturn; @@ -325,7 +326,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::getAddressFromCellBinding: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::getAddressFromCellBinding: caught an exception!" ); } return bReturn; @@ -375,7 +376,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::getStringAddressFromCellListSource: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::getStringAddressFromCellListSource: caught an exception!" ); } return sAddress; @@ -451,7 +452,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::isCellIntegerBindingAllowed: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::isCellIntegerBindingAllowed: caught an exception!" ); // are there really control models which survive isCellBindingAllowed, but don't have a ClassId // property? bAllow = false; @@ -488,7 +489,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "CellBindingHelper::isCellBindingAllowed: caught an exception!" ); + OSL_FAIL( "CellBindingHelper::isCellBindingAllowed: caught an exception!" ); bAllow = false; } } @@ -563,3 +564,5 @@ namespace pcr //............................................................................ } // namespace pcr //............................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx index 30bc94c106f0..58fa295a2b5b 100644 --- a/extensions/source/propctrlr/cellbindinghelper.hxx +++ b/extensions/source/propctrlr/cellbindinghelper.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. @@ -120,7 +121,7 @@ namespace pcr @precond The binding is a valid cell binding, or <NULL/> @return - <FALSE/> if and only if an error occured and no valid address could be obtained + <FALSE/> if and only if an error occurred and no valid address could be obtained @see isCellBinding */ bool getAddressFromCellBinding( @@ -204,7 +205,7 @@ namespace pcr ) const; /** retrieves the index of the sheet which our control belongs to - @return the index of the sheet which our control belongs to or -1, if an error occured + @return the index of the sheet which our control belongs to or -1, if an error occurred */ sal_Int16 getControlSheetIndex( ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& _out_rxSheet @@ -288,3 +289,5 @@ namespace pcr //............................................................................ #endif // EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 647b8b92c480..ebb80d3eba24 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.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. @@ -204,3 +205,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index dd586661990b..a38f0e027255 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.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. @@ -335,3 +336,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index c9659d076de5..e7b8c072438a 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.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. @@ -373,7 +374,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException) { - OSL_ENSURE( false, "CachedInspectorUI::registerControlObserver: not expected to be called!" ); + OSL_FAIL( "CachedInspectorUI::registerControlObserver: not expected to be called!" ); // CachedInspectorUI is used as context for the controls, and we don't expect them to // register listeners themself m_rMaster.getDelegatorUI()->registerControlObserver( _Observer ); @@ -382,7 +383,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException) { - OSL_ENSURE( false, "CachedInspectorUI::revokeControlObserver: not expected to be called!" ); + OSL_FAIL( "CachedInspectorUI::revokeControlObserver: not expected to be called!" ); // CachedInspectorUI is used as context for the controls, and we don't expect them to // register listeners themself m_rMaster.getDelegatorUI()->revokeControlObserver( _Observer ); @@ -857,3 +858,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index d9ae3e0aa76e..0ee9a98eeaf7 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.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. @@ -229,3 +230,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 856e27dc4bc9..508d13ca6552 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_ #include "controlfontdialog.hxx" -#endif #include <cppuhelper/typeprovider.hxx> #include "fontdialog.hxx" #include "formstrings.hxx" @@ -98,7 +97,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.form.ui.OControlFontDialog"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OControlFontDialog")); } //--------------------------------------------------------------------- @@ -111,7 +110,7 @@ namespace pcr ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.ControlFontDialog"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.ControlFontDialog")); return aSupported; } @@ -175,3 +174,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index a681870e134b..55ea4c4eb618 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.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. @@ -98,3 +99,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_CONTROLFONTDIALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/controltype.hxx b/extensions/source/propctrlr/controltype.hxx index 03dc5455c2ce..e4871431ed06 100644 --- a/extensions/source/propctrlr/controltype.hxx +++ b/extensions/source/propctrlr/controltype.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. @@ -52,3 +53,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index f3014d7d2e57..c958e0175647 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.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. @@ -29,15 +30,9 @@ #include "precompiled_extensions.hxx" #include "defaultforminspection.hxx" #include "pcrcommon.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "propctrlr.hrc" #include "formmetadata.hxx" @@ -47,6 +42,7 @@ /** === end UNO includes === **/ #include <cppuhelper/implbase1.hxx> #include <osl/diagnose.h> +#include <sal/macros.h> //------------------------------------------------------------------------ extern "C" void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel() @@ -106,14 +102,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.form.inspection.DefaultFormComponentInspectorModel" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.DefaultFormComponentInspectorModel")); return aSupported; } @@ -149,7 +145,7 @@ namespace pcr { "com.sun.star.form.inspection.EventHandler", false }, // a handler which introduces virtual properties for binding controls to spreadsheet cells - { "com.sun.star.form.inspection.CellBindingPropertyHandler", true }, + { "com.sun.star.form.inspection.CellBindingPropertyHandler", false }, // properties related to binding to an XForms DOM node { "com.sun.star.form.inspection.XMLFormsPropertyHandler", true }, @@ -164,7 +160,7 @@ namespace pcr { "com.sun.star.form.inspection.FormGeometryHandler", true } }; - sal_Int32 nFactories = sizeof( aFactories ) / sizeof( aFactories[ 0 ] ); + sal_Int32 nFactories = SAL_N_ELEMENTS( aFactories ); Sequence< Any > aReturn( nFactories ); Any* pReturn = aReturn.getArray(); for ( sal_Int32 i = 0; i < nFactories; ++i ) @@ -194,7 +190,7 @@ namespace pcr { "Events", RID_STR_EVENTS, HID_FM_PROPDLG_TAB_EVT } }; - sal_Int32 nCategories = sizeof( aCategories ) / sizeof( aCategories[0] ); + sal_Int32 nCategories = SAL_N_ELEMENTS( aCategories ); Sequence< PropertyCategoryDescriptor > aReturn( nCategories ); PropertyCategoryDescriptor* pReturn = aReturn.getArray(); for ( sal_Int32 i=0; i<nCategories; ++i, ++pReturn ) @@ -268,3 +264,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index 53d06e6b5579..3e3a873b5482 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.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. @@ -89,3 +90,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTFORMINSPECTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 30df724728bc..179eef90a819 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.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. @@ -89,14 +90,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.extensions.DefaultHelpProvider"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultHelpProvider")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.inspection.DefaultHelpProvider" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.DefaultHelpProvider")); return aSupported; } @@ -204,3 +205,5 @@ namespace pcr //........................................................................ } // namespace pcr //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index 151fcc872099..b99d513c2f5e 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.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. @@ -91,3 +92,5 @@ namespace pcr //........................................................................ #endif // EXTENSIONS_DEFAULTHELPPROVIDER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 8ea6342943d2..b00b1ceafb55 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.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. @@ -133,13 +134,13 @@ namespace pcr default: - DBG_ERROR( "EditPropertyHandler::getPropertyValue: cannot handle this property!" ); + OSL_FAIL( "EditPropertyHandler::getPropertyValue: cannot handle this property!" ); break; } } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EditPropertyHandler::getPropertyValue: caught an exception!" ); + OSL_FAIL( "EditPropertyHandler::getPropertyValue: caught an exception!" ); } return aReturn; @@ -180,7 +181,7 @@ namespace pcr case TEXTTYPE_MULTILINE: bMultiLine = sal_True; bRichText = sal_False; break; case TEXTTYPE_RICHTEXT: bMultiLine = sal_True; bRichText = sal_True; break; default: - OSL_ENSURE( sal_False, "EditPropertyHandler::setPropertyValue: invalid text type!" ); + OSL_FAIL( "EditPropertyHandler::setPropertyValue: invalid text type!" ); } m_xComponent->setPropertyValue( PROPERTY_MULTILINE, makeAny( bMultiLine ) ); @@ -189,12 +190,12 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "EditPropertyHandler::setPropertyValue: cannot handle this id!" ); + OSL_FAIL( "EditPropertyHandler::setPropertyValue: cannot handle this id!" ); } } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EditPropertyHandler::setPropertyValue: caught an exception!" ); + OSL_FAIL( "EditPropertyHandler::setPropertyValue: caught an exception!" ); } } @@ -313,7 +314,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "EditPropertyHandler::actuatingPropertyChanged: cannot handle this id!" ); + OSL_FAIL( "EditPropertyHandler::actuatingPropertyChanged: cannot handle this id!" ); } } @@ -321,3 +322,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index d3429f635d26..a50e36b430b6 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.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. @@ -80,3 +81,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_EDITPROPERTYHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index d4adaf3281f1..54f78e55a013 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.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. @@ -29,12 +30,8 @@ #include "precompiled_extensions.hxx" #include "eformshelper.hxx" #include "formstrings.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "propeventtranslation.hxx" #include "formbrowsertools.hxx" @@ -50,6 +47,7 @@ #include <functional> #include <algorithm> +#include <o3tl/compat_functional.hxx> //........................................................................ namespace pcr @@ -111,7 +109,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::isEForm: caught an exception!" ); + OSL_FAIL( "EFormsHelper::isEForm: caught an exception!" ); } return false; } @@ -204,7 +202,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::canBindToDataType: caught an exception!" ); + OSL_FAIL( "EFormsHelper::canBindToDataType: caught an exception!" ); } return bCan; @@ -221,7 +219,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::isListEntrySink: caught an exception!" ); + OSL_FAIL( "EFormsHelper::isListEntrySink: caught an exception!" ); } return bIs; } @@ -330,7 +328,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getFormModelNames: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getFormModelNames: caught an exception!" ); } } } @@ -356,7 +354,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getBindingNames: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getBindingNames: caught an exception!" ); } } @@ -373,7 +371,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getFormModelByName: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getFormModelByName: caught an exception!" ); } return xReturn; } @@ -392,7 +390,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentFormModel: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentFormModel: caught an exception!" ); } return xModel; } @@ -409,7 +407,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentFormModel: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentFormModel: caught an exception!" ); } return sModelName; } @@ -426,7 +424,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentBinding: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentBinding: caught an exception!" ); } return xBinding; @@ -444,7 +442,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentBindingName: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentBindingName: caught an exception!" ); } return sBindingName; } @@ -462,7 +460,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getCurrentListSourceBinding: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getCurrentListSourceBinding: caught an exception!" ); } return xReturn; } @@ -479,7 +477,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::setListSourceBinding: caught an exception!" ); + OSL_FAIL( "EFormsHelper::setListSourceBinding: caught an exception!" ); } } @@ -505,7 +503,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::setBinding: caught an exception!" ); + OSL_FAIL( "EFormsHelper::setBinding: caught an exception!" ); } } @@ -639,7 +637,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getModelElementUIName: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getModelElementUIName: caught an exception!" ); } return sUIName; @@ -714,11 +712,11 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::getAllElementUINames: caught an exception!" ); + OSL_FAIL( "EFormsHelper::getAllElementUINames: caught an exception!" ); } _rElementNames.resize( rMapUINameToElement.size() ); - ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::std::select1st< MapStringToPropertySet::value_type >() ); + ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::o3tl::select1st< MapStringToPropertySet::value_type >() ); } //-------------------------------------------------------------------- @@ -743,7 +741,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::firePropertyChange: caught an exception!" ); + OSL_FAIL( "EFormsHelper::firePropertyChange: caught an exception!" ); } } @@ -780,7 +778,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsHelper::firePropertyChanges: caught an exception!" ); + OSL_FAIL( "EFormsHelper::firePropertyChanges: caught an exception!" ); } } @@ -788,3 +786,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index 408ae2a2cabd..ba6c3ca681e4 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.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. @@ -267,3 +268,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_EFORMSHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index e2d57aaee57e..99db682d4ac1 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.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. @@ -152,7 +153,7 @@ namespace pcr break; default: - DBG_ERROR( "EFormsPropertyHandler::getPropertyValue: cannot handle this property!" ); + OSL_FAIL( "EFormsPropertyHandler::getPropertyValue: cannot handle this property!" ); break; } } @@ -163,7 +164,7 @@ namespace pcr sMessage += "\n(have been asked for the \""; sMessage += ::rtl::OString( _rPropertyName.getStr(), _rPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += "\" property.)"; - OSL_ENSURE( sal_False, sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); #endif } return aReturn; @@ -268,7 +269,7 @@ namespace pcr break; default: - DBG_ERROR( "EFormsPropertyHandler::setPropertyValue: cannot handle this property!" ); + OSL_FAIL( "EFormsPropertyHandler::setPropertyValue: cannot handle this property!" ); break; } @@ -279,7 +280,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsPropertyHandler::setPropertyValue: caught an exception!" ); + OSL_FAIL( "EFormsPropertyHandler::setPropertyValue: caught an exception!" ); } } @@ -462,7 +463,7 @@ namespace pcr case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; default: - DBG_ERROR( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); + OSL_FAIL( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); break; } @@ -537,7 +538,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EFormsPropertyHandler::onInteractivePropertySelection: caught an exception!" ); + OSL_FAIL( "EFormsPropertyHandler::onInteractivePropertySelection: caught an exception!" ); } // something went wrong here ...(but has been asserted already) @@ -605,7 +606,7 @@ namespace pcr break; default: - DBG_ERROR( "EFormsPropertyHandler::actuatingPropertyChanged: cannot handle this property!" ); + OSL_FAIL( "EFormsPropertyHandler::actuatingPropertyChanged: cannot handle this property!" ); break; } } @@ -614,3 +615,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index 222ff1ce94f8..1cf932e6c7ff 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.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. @@ -106,3 +107,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_EFORMSPROPERTYHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index 05872d2d80d1..b6f65724b520 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.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. @@ -74,3 +75,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 24fb4e8b88db..ca4baaca2afb 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.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. @@ -77,6 +78,7 @@ #include <map> #include <algorithm> +#include <o3tl/compat_functional.hxx> //------------------------------------------------------------------------ extern "C" void SAL_CALL createRegistryInfo_EventHandler() @@ -219,7 +221,7 @@ namespace pcr DESCRIBE_EVENT( "sdb", "XRowSetApproveListener", "approveCursorMove", POSITIONING ); DESCRIBE_EVENT( "sdbc", "XRowSetListener", "cursorMoved", POSITIONED ); DESCRIBE_EVENT( "form", "XDatabaseParameterListener", "approveParameter", APPROVEPARAMETER ); - DESCRIBE_EVENT( "sdb", "XSQLErrorListener", "errorOccured", ERROROCCURED ); + DESCRIBE_EVENT( "sdb", "XSQLErrorListener", "errorOccured", ERROROCCURRED ); DESCRIBE_EVENT( "awt", "XAdjustmentListener", "adjustmentValueChanged", ADJUSTMENTVALUECHANGED ); } } @@ -264,13 +266,13 @@ namespace pcr || ( pAssignedEvent->ScriptType.getLength() == 0 ) ) { - DBG_ERROR( "lcl_getAssignedScriptEvent: me thinks this should not happen!" ); + OSL_FAIL( "lcl_getAssignedScriptEvent: me thinks this should not happen!" ); continue; } aScriptEvent = *pAssignedEvent; - if ( !aScriptEvent.ScriptType.equalsAscii( "StarBasic" ) ) + if ( !aScriptEvent.ScriptType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarBasic" ) ) ) continue; // this is an old-style macro specification: @@ -303,7 +305,7 @@ namespace pcr EventDescription aKnownEvent; if ( lcl_getEventDescriptionForMethod( _rFormComponentEventDescriptor.EventMethod, aKnownEvent ) ) return aKnownEvent.sListenerClassName; - DBG_ERROR( "lcl_getQualifiedKnownListenerName: unknown method name!" ); + OSL_FAIL( "lcl_getQualifiedKnownListenerName: unknown method name!" ); // somebody assigned an script to a form component event which we don't know // Speaking strictly, this is not really an error - it is possible to do // this programmatically -, but it should rarely happen, since it's not possible @@ -353,7 +355,7 @@ namespace pcr class EventHolder : public EventHolder_Base { private: - typedef ::std::hash_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< ::rtl::OUString, ScriptEventDescriptor, ::rtl::OUStringHash > EventMap; typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess; EventMap m_aEventNameAccess; @@ -446,9 +448,9 @@ namespace pcr Any aRet; Sequence< PropertyValue > aScriptDescriptor( 2 ); - aScriptDescriptor[0].Name = ::rtl::OUString::createFromAscii( "EventType" ); + aScriptDescriptor[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType")); aScriptDescriptor[0].Value <<= aDescriptor.ScriptType; - aScriptDescriptor[1].Name = ::rtl::OUString::createFromAscii( "Script" ); + aScriptDescriptor[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")); aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode; return makeAny( aScriptDescriptor ); @@ -844,7 +846,7 @@ namespace pcr StlSyntaxSequence< Property > aReturn( aOrderedProperties.size() ); ::std::transform( aOrderedProperties.begin(), aOrderedProperties.end(), aReturn.begin(), - ::std::select2nd< ::std::map< EventId, Property >::value_type >() ); + ::o3tl::select2nd< ::std::map< EventId, Property >::value_type >() ); return aReturn; } @@ -970,7 +972,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL EventHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { - DBG_ERROR( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" ); + OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" ); } //-------------------------------------------------------------------- @@ -1283,3 +1285,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index a2d9003a75f4..228d3cf44634 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.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. @@ -76,7 +77,7 @@ namespace pcr const rtl::OString& _sUniqueBrowseId ); }; - typedef ::std::hash_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; + typedef ::boost::unordered_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; //==================================================================== //= EventHandler @@ -263,3 +264,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index e1fe31c56bb8..e310fd77cb6b 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.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. @@ -29,19 +30,11 @@ #include "precompiled_extensions.hxx" #include <sfx2/sfxsids.hrc> #include "fontdialog.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ #include "formlocalid.hrc" -#endif #include <vcl/svapp.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <comphelper/types.hxx> #include <comphelper/extract.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> @@ -52,9 +45,7 @@ #include "formstrings.hxx" #include "fontitemids.hxx" #include <editeng/charreliefitem.hxx> -#ifndef _SVX_EMPHITEM_HXX #include <editeng/emphitem.hxx> -#endif #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/postitem.hxx> @@ -62,7 +53,6 @@ #include <editeng/udlnitem.hxx> #include <editeng/crsditem.hxx> #include <editeng/colritem.hxx> -#include <editeng/flstitem.hxx> #include <editeng/langitem.hxx> #include <editeng/wrlmitem.hxx> #include <editeng/cmapitem.hxx> @@ -72,11 +62,9 @@ #include <svtools/ctrltool.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/beans/XPropertyState.hpp> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> //CHINA001 -#endif -#include <svx/svxdlg.hxx> //CHINA001 -#include <svx/dialogs.hrc> //CHINA001 +#include <svx/svxids.hrc> +#include <svx/svxdlg.hxx> +#include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> //............................................................................ namespace pcr @@ -293,7 +281,7 @@ namespace pcr } catch (Exception&) { - DBG_ERROR("ControlCharacterDialog::translatePropertiesToItems: caught an exception!"); + OSL_FAIL("ControlCharacterDialog::translatePropertiesToItems: caught an exception!"); } _pSet->DisableItem(SID_ATTR_CHAR_CJK_FONT); @@ -538,7 +526,7 @@ namespace pcr *pCounter++ = new SvxFontListItem (new FontList(Application::GetDefaultDevice()), CFID_FONTLIST); // create the pool - static SfxItemInfo __READONLY_DATA aItemInfos[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1] = + static SfxItemInfo const aItemInfos[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1] = { { SID_ATTR_CHAR_FONT, 0 }, { SID_ATTR_CHAR_FONTHEIGHT, 0 }, @@ -606,22 +594,10 @@ namespace pcr void ControlCharacterDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - switch ( _nId ) - { - case TABPAGE_CHARACTERS: -//CHINA001 static_cast<SvxCharNamePage&>(_rPage).SetFontList( -//CHINA001 static_cast<const SvxFontListItem&>(GetInputSetImpl()->Get(CFID_FONTLIST)) -//CHINA001 ); -//CHINA001 static_cast<SvxCharNamePage&>(_rPage).DisableControls( DISABLE_HIDE_LANGUAGE ); - -//CHINA001 SvxFontListItem aFontListItem( static_cast<const SvxFontListItem&>(GetInputSetImpl()->Get(CFID_FONTLIST) )); -//CHINA001 aSet.Put ( SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); - -// aSet.Put (SfxUInt16Item(SID_CFID_FONTLIST,CFID_FONTLIST)); - aSet.Put (SvxFontListItem(static_cast<const SvxFontListItem&>(GetInputSetImpl()->Get(CFID_FONTLIST)))); - aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_HIDE_LANGUAGE)); - _rPage.PageCreated(aSet); - break; + if ( _nId == TABPAGE_CHARACTERS ) { + aSet.Put (SvxFontListItem(static_cast<const SvxFontListItem&>(GetInputSetImpl()->Get(CFID_FONTLIST)))); + aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_HIDE_LANGUAGE)); + _rPage.PageCreated(aSet); } } @@ -629,3 +605,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index 5604270ac037..5cd285470fc4 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.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. @@ -81,3 +82,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_FONTDIALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/fontitemids.hxx b/extensions/source/propctrlr/fontitemids.hxx index 0296f31f5d9d..888b80c15c6b 100644 --- a/extensions/source/propctrlr/fontitemids.hxx +++ b/extensions/source/propctrlr/fontitemids.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. @@ -64,3 +65,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index ed75149ac460..1e60db01326c 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.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. @@ -31,12 +32,8 @@ #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include <tools/string.hxx> #include "formstrings.hxx" @@ -146,3 +143,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index 619c48cb4d6b..4374c28e253e 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.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. @@ -106,3 +107,4 @@ namespace pcr #endif // _EXTENSIONS_FORMSCTRLR_FORMBROWSERTOOLS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index bc83c820e909..e865f99b6431 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.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. @@ -105,6 +106,7 @@ #include <vcl/stdtext.hxx> #include <vcl/wrkwin.hxx> #include <tools/StringListResource.hxx> +#include <sal/macros.h> #include <limits> @@ -381,8 +383,8 @@ namespace pcr // StringItemList? else if( eType == TypeClass_SEQUENCE ) { - static ::rtl::OUString aDot = ::rtl::OUString::createFromAscii( "." ); - static ::rtl::OUString aEsc = ::rtl::OUString::createFromAscii( "&" ); + static ::rtl::OUString aDot(RTL_CONSTASCII_USTRINGPARAM(".")); + static ::rtl::OUString aEsc(RTL_CONSTASCII_USTRINGPARAM("&")); // Put strings into resource using new ids Sequence< ::rtl::OUString > aNewStrings; @@ -616,7 +618,7 @@ namespace pcr case 1: nWritingMode = WritingMode2::RL_TB; break; case 2: nWritingMode = WritingMode2::CONTEXT; break; default: - OSL_ENSURE( false, "FormComponentPropertyHandler::convertToPropertyValue: unexpected 'normalized value' for WritingMode!" ); + OSL_FAIL( "FormComponentPropertyHandler::convertToPropertyValue: unexpected 'normalized value' for WritingMode!" ); nWritingMode = WritingMode2::CONTEXT; break; } @@ -752,7 +754,7 @@ namespace pcr case WritingMode2::RL_TB: nNormalized = 1; break; case WritingMode2::CONTEXT: nNormalized = 2; break; default: - OSL_ENSURE( false, "FormComponentPropertyHandler::convertToControlValue: unsupported API value for WritingMode!" ); + OSL_FAIL( "FormComponentPropertyHandler::convertToControlValue: unsupported API value for WritingMode!" ); nNormalized = 2; break; } @@ -998,7 +1000,7 @@ namespace pcr String sDisplayName = m_pInfoService->getPropertyTranslation( nPropId ); if ( !sDisplayName.Len() ) { - DBG_ERROR( "FormComponentPropertyHandler::describePropertyLine: did getSupportedProperties not work properly?" ); + OSL_FAIL( "FormComponentPropertyHandler::describePropertyLine: did getSupportedProperties not work properly?" ); throw UnknownPropertyException(); } @@ -1422,7 +1424,7 @@ namespace pcr aDescriptor.HasSecondaryButton = sal_True; bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; - aDescriptor.Category = ::rtl::OUString::createFromAscii( bIsDataProperty ? "Data" : "General" ); + aDescriptor.Category = bIsDataProperty ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("General")); return aDescriptor; } @@ -1511,7 +1513,7 @@ namespace pcr eResult = InteractiveSelectionResult_Pending; break; default: - DBG_ERROR( "FormComponentPropertyHandler::onInteractivePropertySelection: request for a property which does not have dedicated UI!" ); + OSL_FAIL( "FormComponentPropertyHandler::onInteractivePropertySelection: request for a property which does not have dedicated UI!" ); break; } return eResult; @@ -1723,7 +1725,7 @@ namespace pcr // propagate the changes to the min/max/default fields Any aCurrentProp; ::rtl::OUString aAffectedProps[] = { PROPERTY_VALUE, PROPERTY_DEFAULT_VALUE, PROPERTY_VALUEMIN, PROPERTY_VALUEMAX }; - for (sal_uInt16 i=0; i<sizeof(aAffectedProps)/sizeof(aAffectedProps[0]); ++i) + for (sal_uInt16 i=0; i<SAL_N_ELEMENTS(aAffectedProps); ++i) { Reference< XPropertyControl > xControl; try @@ -1770,7 +1772,7 @@ namespace pcr ::rtl::OUString aFormattedPropertyControls[] = { PROPERTY_EFFECTIVE_MIN, PROPERTY_EFFECTIVE_MAX, PROPERTY_EFFECTIVE_DEFAULT, PROPERTY_EFFECTIVE_VALUE }; - for ( sal_uInt16 i=0; i<sizeof(aFormattedPropertyControls)/sizeof(aFormattedPropertyControls[0]); ++i ) + for ( sal_uInt16 i=0; i<SAL_N_ELEMENTS(aFormattedPropertyControls); ++i ) { Reference< XPropertyControl > xControl; try @@ -1799,7 +1801,7 @@ namespace pcr break; default: - DBG_ERROR( "FormComponentPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); + OSL_FAIL( "FormComponentPropertyHandler::actuatingPropertyChanged: did not register for this property!" ); break; } // switch ( nActuatingPropId ) @@ -2013,14 +2015,14 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: unexpected property to update!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: unexpected property to update!" ); break; } // switch } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" ); } } @@ -2094,7 +2096,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_initComponentMetaData_throw: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_initComponentMetaData_throw: caught an exception!" ); } } @@ -2163,8 +2165,8 @@ namespace pcr ControlType::PROGRESSBAR }; - sal_Int32 nKnownControlTypes = sizeof( aControlModelServiceNames ) / sizeof( aControlModelServiceNames[ 0 ] ); - OSL_ENSURE( nKnownControlTypes == sizeof( nClassIDs ) / sizeof( nClassIDs[ 0 ] ), + sal_Int32 nKnownControlTypes = SAL_N_ELEMENTS( aControlModelServiceNames ); + OSL_ENSURE( nKnownControlTypes == SAL_N_ELEMENTS( nClassIDs ), "FormComponentPropertyHandler::impl_classifyControlModel_throw: inconsistence" ); for ( sal_Int32 i = 0; i < nKnownControlTypes; ++i ) @@ -2348,7 +2350,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_getRowSet_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_getRowSet_nothrow: caught an exception!" ); } return xReturn; } @@ -2387,7 +2389,7 @@ namespace pcr } catch (Exception&) { - DBG_ERROR( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" ); } } @@ -2441,7 +2443,7 @@ namespace pcr } catch( const Exception& ) { - DBG_ERROR( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" ); } // additional info about what happended String sInfo( PcrRes( RID_STR_UNABLETOCONNECT ) ); @@ -2501,7 +2503,7 @@ namespace pcr } catch (Exception&) { - DBG_ERROR("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !"); + OSL_FAIL("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !"); } } @@ -2676,7 +2678,7 @@ namespace pcr catch (SQLException& e) { aErrorInfo = e; } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: caught an exception!" ); } if ( aErrorInfo.isValid() ) @@ -2768,7 +2770,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormComponentPropertyHandler::impl_dialogFormatting_nothrow: : caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_dialogFormatting_nothrow: : caught an exception!" ); } return bChanged; } @@ -2783,8 +2785,9 @@ namespace pcr aFileDlg.SetTitle(aStrTrans); // non-linked images ( e.g. those located in the document - // stream ) cannot *currently* be handled by openoffice basic dialogs. - bool bHandleNonLink = ( m_eComponentClass == eFormControl ); + // stream ) only if document is available + Reference< XModel > xModel( impl_getContextDocument_nothrow() ); + bool bHandleNonLink = xModel.is(); Reference< XFilePickerControlAccess > xController(aFileDlg.GetFilePicker(), UNO_QUERY); DBG_ASSERT(xController.is(), "FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the controller interface on the file picker!"); @@ -2843,7 +2846,6 @@ namespace pcr if ( INET_PROT_FILE == aParser.GetProtocol() ) // set the initial directory only for file-URLs. Everything else // is considered to be potentially expensive - // 106126 - 2002/12/10 - fs@openoffice.org aFileDlg.SetDisplayDirectory( sURL ); _rClearBeforeDialog.clear(); @@ -2897,7 +2899,6 @@ namespace pcr if ( INET_PROT_FILE == aParser.GetProtocol() ) // set the initial directory only for file-URLs. Everything else // is considered to be potentially expensive - // 106126 - 2002/12/10 - fs@openoffice.org aFileDlg.SetDisplayDirectory( sDataSource ); const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); @@ -3139,7 +3140,7 @@ namespace pcr return sValue; } - OSL_ENSURE( false, "ValueListCommandUI::getSQLCommand: unexpected property type!" ); + OSL_FAIL( "ValueListCommandUI::getSQLCommand: unexpected property type!" ); return sValue; } @@ -3214,7 +3215,7 @@ namespace pcr xCommandUI = new ValueListCommandUI( xComponentProperties ); break; default: - OSL_ENSURE( false, "FormComponentPropertyHandler::OnDesignerClosed: invalid property id!" ); + OSL_FAIL( "FormComponentPropertyHandler::OnDesignerClosed: invalid property id!" ); return false; } @@ -3295,7 +3296,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( false, "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow: caught an exception!" ); + OSL_FAIL( "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow: caught an exception!" ); } } return bHas; @@ -3339,3 +3340,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 01f56bd7ac0d..54e3c75e2726 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.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. @@ -477,3 +478,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMCOMPONENTHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 1e894452edbe..9e6667baf5ff 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.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. @@ -31,9 +32,7 @@ #include "pcrcommon.hxx" #include "formstrings.hxx" #include "defaultforminspection.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ #include "propctrlr.hrc" -#endif /** === begin UNO includes === **/ #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -146,14 +145,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString FormController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.FormController"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.FormController")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.form.PropertyBrowserController" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.PropertyBrowserController")); return aSupported; } @@ -274,14 +273,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DialogController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.DialogController"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DialogController")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.PropertyBrowserController" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PropertyBrowserController")); return aSupported; } @@ -297,3 +296,5 @@ namespace pcr //........................................................................ } // namespace pcr //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index e62a47586087..d46b4e04a76c 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.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. @@ -138,3 +139,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 31a2b9315238..d93f023e4add 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.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. * @@ -375,7 +376,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormGeometryHandler::getPropertyValue: huh?" ); + OSL_FAIL( "FormGeometryHandler::getPropertyValue: huh?" ); break; } } @@ -442,7 +443,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormGeometryHandler::getPropertyValue: huh?" ); + OSL_FAIL( "FormGeometryHandler::getPropertyValue: huh?" ); break; } } @@ -490,7 +491,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormGeometryHandler::describePropertyLine: huh?" ); + OSL_FAIL( "FormGeometryHandler::describePropertyLine: huh?" ); break; } } @@ -546,7 +547,7 @@ namespace pcr } break; default: - OSL_ENSURE( false, "FormGeometryHandler::actuatingPropertyChanged: not registered for this property!" ); + OSL_FAIL( "FormGeometryHandler::actuatingPropertyChanged: not registered for this property!" ); break; } } @@ -705,7 +706,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "FormGeometryHandler::impl_setSheetAnchorType_nothrow: illegal anchor type!" ); + OSL_FAIL( "FormGeometryHandler::impl_setSheetAnchorType_nothrow: illegal anchor type!" ); break; } } @@ -741,13 +742,13 @@ namespace pcr ::std::vector< EventTranslation > aEventTranslations; aEventTranslations.reserve(2); - if ( _event.PropertyName.equalsAscii( "Position" ) ) + if ( _event.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Position" ) ) ) { AwtPoint aPos = m_xShape->getPosition(); aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONX, makeAny( aPos.X ) ) ); aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONY, makeAny( aPos.Y ) ) ); } - else if ( _event.PropertyName.equalsAscii( "Size" ) ) + else if ( _event.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) { AwtSize aSize = m_xShape->getSize(); aEventTranslations.push_back( EventTranslation( PROPERTY_WIDTH, makeAny( aSize.Width ) ) ); @@ -824,3 +825,5 @@ extern "C" void SAL_CALL createRegistryInfo_FormGeometryHandler() { ::pcr::FormGeometryHandler::registerImplementation(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 7010c9102188..dbec1862d10f 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.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. @@ -31,12 +32,8 @@ #include "formlinkdialog.hxx" #include "formlinkdialog.hrc" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "formstrings.hxx" #include <vcl/combobox.hxx> #include <vcl/msgbox.hxx> @@ -242,7 +239,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::commitLinkPairs: caught an exception while setting the properties!" ); + OSL_FAIL( "FormLinkDialog::commitLinkPairs: caught an exception while setting the properties!" ); } } @@ -346,7 +343,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::initializeLinks: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::initializeLinks: caught an exception!" ); } } @@ -397,7 +394,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::getFormDataSourceType: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::getFormDataSourceType: caught an exception!" ); } return sReturn; } @@ -436,7 +433,7 @@ namespace pcr catch (const SQLException& e ) { aErrorInfo = e; } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::getFormFields: caught a non-SQL exception!" ); + OSL_FAIL( "FormLinkDialog::getFormFields: caught a non-SQL exception!" ); } if ( aErrorInfo.isValid() ) @@ -503,7 +500,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::getCanonicUnderlyingTable: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::getCanonicUnderlyingTable: caught an exception!" ); } return xTable; } @@ -568,7 +565,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::getExistingRelation: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::getExistingRelation: caught an exception!" ); } return ( _rLeftFields.getLength() > 0 ) && ( _rLeftFields[ 0 ].getLength() > 0 ); @@ -644,7 +641,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "FormLinkDialog::initializeSuggest: caught an exception!" ); + OSL_FAIL( "FormLinkDialog::initializeSuggest: caught an exception!" ); } } @@ -674,3 +671,5 @@ namespace pcr //............................................................................ } // namespace pcr //............................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 9605ee622234..a660a569cd89 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.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. @@ -30,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif /** === begin UNO includes === **/ #include <com/sun/star/form/XForm.hpp> @@ -148,3 +147,5 @@ namespace pcr //............................................................................ #endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formlocalid.hrc b/extensions/source/propctrlr/formlocalid.hrc index dca59a024321..708a1dbc2211 100644 --- a/extensions/source/propctrlr/formlocalid.hrc +++ b/extensions/source/propctrlr/formlocalid.hrc @@ -33,7 +33,5 @@ #define IMG_PLUS 1 #define IMG_MINUS 2 -#define IMG_PLUS_HC 3 -#define IMG_MINUS_HC 4 #endif // _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index d5dea0841c54..16dc70b05187 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.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. @@ -28,18 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "formmetadata.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ -#include "propctrlr.hrc" -#endif #include "formstrings.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "propctrlr.hrc" #include <svtools/localresaccess.hxx> #include <tools/debug.hxx> #include <comphelper/extract.hxx> - +#include <sal/macros.h> #include <algorithm> #include <functional> @@ -138,6 +134,7 @@ namespace pcr DEF_INFO_3( LABEL, LABEL, LABEL, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( CONTROLLABEL, LABELCONTROL, CONTROLLABEL, FORM_VISIBLE, COMPOSEABLE ), DEF_INFO_3( WRITING_MODE, WRITING_MODE, WRITING_MODE, FORM_VISIBLE, ENUM, COMPOSEABLE ), + DEF_INFO_3( GROUP_NAME, GROUP_NAME, GROUP_NAME, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( TEXT, TEXT, TEXT, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( MAXTEXTLEN, MAXTEXTLEN, MAXTEXTLEN, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( EDITMASK, EDITMASK, EDITMASK, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), @@ -362,7 +359,7 @@ namespace pcr }; s_pPropertyInfos = aPropertyInfos; - s_nCount = sizeof(aPropertyInfos) / sizeof(OPropertyInfoImpl); + s_nCount = SAL_N_ELEMENTS(aPropertyInfos); // sort ::std::sort( s_pPropertyInfos, s_pPropertyInfos + s_nCount, PropertyInfoLessByName() ); @@ -520,7 +517,7 @@ namespace pcr nStringItemsResId = RID_RSC_ENUM_SHEET_ANCHOR_TYPE; break; default: - OSL_ENSURE( sal_False, "OPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" ); + OSL_FAIL( "OPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" ); break; } @@ -654,7 +651,7 @@ namespace pcr } else { - DBG_ERROR( "DefaultEnumRepresentation::getValueFromDescription: could not translate the enum string!" ); + OSL_FAIL( "DefaultEnumRepresentation::getValueFromDescription: could not translate the enum string!" ); _out_rValue.clear(); } } @@ -678,7 +675,7 @@ namespace pcr } else { - DBG_ERROR( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" ); + OSL_FAIL( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" ); } return sReturn; } @@ -704,3 +701,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index 82a313a70105..9c112e965538 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.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. @@ -29,9 +30,7 @@ #define _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_ #include "propertyinfo.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "enumrepresentation.hxx" #include <comphelper/composedprops.hxx> @@ -163,6 +162,7 @@ namespace pcr #define PROPERTY_ID_ALLOWADDITIONS 20 #define PROPERTY_ID_ALLOWEDITS 21 #define PROPERTY_ID_ALLOWDELETIONS 22 + #define PROPERTY_ID_GROUP_NAME 23 #define PROPERTY_ID_NAVIGATION 24 #define PROPERTY_ID_CYCLE 25 #define PROPERTY_ID_HIDDEN_VALUE 26 @@ -348,3 +348,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formres.src b/extensions/source/propctrlr/formres.src index 1daadd6e0f01..83763b152d66 100644 --- a/extensions/source/propctrlr/formres.src +++ b/extensions/source/propctrlr/formres.src @@ -231,6 +231,10 @@ String RID_STR_NAME { Text [ en-US ] = "Name" ; }; +String RID_STR_GROUP_NAME +{ + Text [ en-US ] = "Group name" ; +}; String RID_STR_TABINDEX { Text [ en-US ] = "Tab order" ; @@ -771,7 +775,7 @@ String RID_STR_EVT_CONFIRMDELETE { Text [ en-US ] = "Confirm deletion" ; }; -String RID_STR_EVT_ERROROCCURED +String RID_STR_EVT_ERROROCCURRED { Text [ en-US ] = "Error occurred" ; }; diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index f2de0c252d8b..a3238220ddc7 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -149,6 +149,7 @@ #define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 ) #define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 ) #define RID_STR_WHEEL_BEHAVIOR ( RID_FORMBROWSER_START + 123 ) +#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 124 ) // FREE // FREE // FREE @@ -188,7 +189,7 @@ #define RID_STR_EVT_POSITIONING ( RID_FORMBROWSER_START + 160 ) #define RID_STR_EVT_POSITIONED ( RID_FORMBROWSER_START + 161 ) #define RID_STR_EVT_APPROVEPARAMETER ( RID_FORMBROWSER_START + 162 ) -#define RID_STR_EVT_ERROROCCURED ( RID_FORMBROWSER_START + 163 ) +#define RID_STR_EVT_ERROROCCURRED ( RID_FORMBROWSER_START + 163 ) #define RID_STR_EVENTS ( RID_FORMBROWSER_START + 164 ) #define RID_STR_ESCAPE_PROCESSING ( RID_FORMBROWSER_START + 165 ) // FREE @@ -307,7 +308,6 @@ // - ImageLists #define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START + 0 ) -#define RID_IL_FORMEXPLORER_HC ( RID_PROPCONTROLLER_START + 1 ) // ----------------------------------------------------------------------- // - untyped resources @@ -363,7 +363,6 @@ #define RID_SVXIMG_EDIT 10599 #define RID_SVXIMG_LISTBOX 10600 #define RID_SVXIMG_COMBOBOX 10601 -#define RID_SVXIMG_URLBUTTON 10602 #define RID_SVXIMG_GRID 10603 #define RID_SVXIMG_IMAGEBUTTON 10604 #define RID_SVXIMG_FILECONTROL 10605 diff --git a/extensions/source/propctrlr/formstrings.cxx b/extensions/source/propctrlr/formstrings.cxx index 57aff105567b..9d04554cb554 100644 --- a/extensions/source/propctrlr/formstrings.cxx +++ b/extensions/source/propctrlr/formstrings.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. @@ -34,3 +35,4 @@ #undef PCR_IMPLEMENT_STRINGS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx index 20b0dd34b2cd..19bffe32e30c 100644 --- a/extensions/source/propctrlr/formstrings.hxx +++ b/extensions/source/propctrlr/formstrings.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. @@ -48,6 +49,7 @@ namespace pcr PCR_CONSTASCII_STRING( PROPERTY_WHEEL_BEHAVIOR, "MouseWheelBehavior"); PCR_CONSTASCII_STRING( PROPERTY_TAG, "Tag"); PCR_CONSTASCII_STRING( PROPERTY_NAME, "Name"); + PCR_CONSTASCII_STRING( PROPERTY_GROUP_NAME, "GroupName"); PCR_CONSTASCII_STRING( PROPERTY_VALUE, "Value"); PCR_CONSTASCII_STRING( PROPERTY_TEXT, "Text"); PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION, "NavigationBarMode"); @@ -305,3 +307,4 @@ namespace pcr #endif // _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 65514038181d..df06374fe2d2 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.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. @@ -45,6 +46,7 @@ #include <comphelper/extract.hxx> #include <algorithm> +#include <o3tl/compat_functional.hxx> //------------------------------------------------------------------------ extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler() @@ -119,7 +121,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EnumRepresentation::EnumRepresentation: caught an exception!" ); + OSL_FAIL( "EnumRepresentation::EnumRepresentation: caught an exception!" ); } } @@ -134,7 +136,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EnumRepresentation::getDescriptions: caught an exception!" ); + OSL_FAIL( "EnumRepresentation::getDescriptions: caught an exception!" ); } return ::std::vector< ::rtl::OUString >( aNames.getConstArray(), aNames.getConstArray() + aNames.getLength() ); @@ -151,7 +153,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "EnumRepresentation::impl_getValues: caught an exception!" ); + OSL_FAIL( "EnumRepresentation::impl_getValues: caught an exception!" ); } } @@ -170,7 +172,7 @@ namespace pcr _out_rValue = ::cppu::int2enum( aValues[ index ], m_aEnumType ); else { - DBG_ERROR( "EnumRepresentation::getValueFromDescription: cannot convert!" ); + OSL_FAIL( "EnumRepresentation::getValueFromDescription: cannot convert!" ); _out_rValue.clear(); } } @@ -194,7 +196,7 @@ namespace pcr sDescription = aDescriptions[ index ]; else { - DBG_ERROR( "EnumRepresentation::getDescriptionForValue: cannot convert!" ); + OSL_FAIL( "EnumRepresentation::getDescriptionForValue: cannot convert!" ); } return sDescription; } @@ -514,7 +516,7 @@ namespace pcr } catch( const UnknownPropertyException& ) { - OSL_ENSURE( false, "GenericPropertyHandler::addPropertyChangeListener:\nThe inspected component does not allow registering for all properties at once! This violates the interface contract!" ); + OSL_FAIL( "GenericPropertyHandler::addPropertyChangeListener:\nThe inspected component does not allow registering for all properties at once! This violates the interface contract!" ); } } } @@ -531,7 +533,7 @@ namespace pcr } catch( const UnknownPropertyException& ) { - OSL_ENSURE( false, "GenericPropertyHandler::removePropertyChangeListener:\nThe inspected component does not allow de-registering for all properties at once! This violates the interface contract!" ); + OSL_FAIL( "GenericPropertyHandler::removePropertyChangeListener:\nThe inspected component does not allow de-registering for all properties at once! This violates the interface contract!" ); } } m_aPropertyListeners.removeInterface( _rxListener ); @@ -600,7 +602,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "GenericPropertyHandler::impl_ensurePropertyMap: caught an exception!" ); + OSL_FAIL( "GenericPropertyHandler::impl_ensurePropertyMap: caught an exception!" ); } } } @@ -613,7 +615,7 @@ namespace pcr Sequence< Property > aReturn( m_aProperties.size() ); ::std::transform( m_aProperties.begin(), m_aProperties.end(), - aReturn.getArray(), ::std::select2nd< PropertyMap::value_type >() ); + aReturn.getArray(), ::o3tl::select2nd< PropertyMap::value_type >() ); return aReturn; } @@ -693,14 +695,14 @@ namespace pcr //-------------------------------------------------------------------- InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { - DBG_ERROR( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" ); + OSL_FAIL( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" ); return InteractiveSelectionResult_Cancelled; } //-------------------------------------------------------------------- void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { - DBG_ERROR( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" ); + OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" ); } //-------------------------------------------------------------------- @@ -724,3 +726,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 6e5e5acc575c..24beb828a0bf 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.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. @@ -159,3 +160,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index ae87a85a3722..e813e205267c 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.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. @@ -28,14 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "handlerhelper.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif #include "formresid.hrc" #include <comphelper/extract.hxx> -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "enumrepresentation.hxx" #include "formmetadata.hxx" #include "pcrcomponentcontext.hxx" @@ -116,7 +113,7 @@ namespace pcr break; default: - DBG_ERROR( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" ); + OSL_FAIL( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" ); // NO break! case TypeClass_STRING: @@ -219,7 +216,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PropertyHandlerHelper::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); + OSL_FAIL( "PropertyHandlerHelper::convertToPropertyValue: caught an exception while converting via TypeConverter!" ); } } @@ -249,7 +246,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PropertyHandlerHelper::convertToControlValue: caught an exception while converting via TypeConverter!" ); + OSL_FAIL( "PropertyHandlerHelper::convertToControlValue: caught an exception while converting via TypeConverter!" ); } } @@ -289,3 +286,5 @@ namespace pcr //........................................................................ } // namespace pcr //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index e55cbf207526..9be5b6add529 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.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. @@ -215,3 +216,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index dbf562a7536c..29b192d52f0e 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.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. @@ -28,9 +29,7 @@ #include "precompiled_extensions.hxx" #include "inspectorhelpwindow.hxx" #include "modulepcr.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ @@ -151,3 +150,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx index 910948b9b563..e5f9d3f72863 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.hxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.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. @@ -76,3 +77,4 @@ namespace pcr #endif // HELPWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 8695695d4530..751673af491b 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.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. @@ -270,3 +271,5 @@ namespace pcr //........................................................................ } // namespace pcr //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index 9f06515b5d2d..0ca2ded6e19c 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.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. @@ -106,3 +107,4 @@ namespace pcr #endif // INSPECTORMODELBASE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index d85655c1d5f2..e6db8b65c090 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.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. @@ -68,3 +69,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 14e4ce7de68e..774757ee3b34 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.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. @@ -28,16 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "listselectiondlg.hxx" -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC #include "listselectiondlg.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "formstrings.hxx" #include <vcl/msgbox.hxx> @@ -115,7 +110,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ListSelectionDialog::initialize: caught an exception!" ); + OSL_FAIL( "ListSelectionDialog::initialize: caught an exception!" ); } } @@ -134,7 +129,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "ListSelectionDialog::commitSelection: caught an exception!" ); + OSL_FAIL( "ListSelectionDialog::commitSelection: caught an exception!" ); } } @@ -171,3 +166,5 @@ namespace pcr //........................................................................ } // namespace pcr //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index c741f1e08945..740e29c7a5f7 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.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. @@ -30,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> /** === begin UNO includes === **/ @@ -87,3 +86,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/modulepcr.cxx b/extensions/source/propctrlr/modulepcr.cxx index 4b81c740ad79..827ca1a648ba 100644 --- a/extensions/source/propctrlr/modulepcr.cxx +++ b/extensions/source/propctrlr/modulepcr.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. @@ -29,12 +30,8 @@ #include "precompiled_extensions.hxx" #include "modulepcr.hxx" -#ifndef INCLUDED_OSL_DOUBLECHECKEDLOCKING_H #include <rtl/instance.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/getglobalmutex.hxx> -#endif //........................................................................ namespace pcr @@ -46,3 +43,5 @@ namespace pcr //........................................................................ } // namespace pcr //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/modulepcr.hxx b/extensions/source/propctrlr/modulepcr.hxx index 90ece54e29cf..8d18e6ea0169 100644 --- a/extensions/source/propctrlr/modulepcr.hxx +++ b/extensions/source/propctrlr/modulepcr.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. @@ -43,3 +44,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 412048a9e7b2..44253137de0d 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.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. @@ -28,16 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "newdatatype.hxx" -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HRC #include "newdatatype.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ @@ -107,3 +102,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 501354c3fcf2..e84f3ffe9ce7 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.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,9 +34,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <set> @@ -75,3 +74,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index fdffb69632b5..7ed387cdf9ee 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.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. @@ -240,3 +241,5 @@ extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel() { ::pcr::OAutoRegistration< ::pcr::ObjectInspectorModel > aObjectInspectorModelRegistration; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcr.xml b/extensions/source/propctrlr/pcr.xml index 3507a452d056..abd86572fc6b 100644 --- a/extensions/source/propctrlr/pcr.xml +++ b/extensions/source/propctrlr/pcr.xml @@ -4,7 +4,7 @@ <module-name>pcr</module-name> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.form.ui.OTabOrderDialog</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -14,7 +14,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.form.ControlFontDialog</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -24,7 +24,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.FormComponentPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -34,7 +34,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.EFormsPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -44,7 +44,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.EditPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -54,7 +54,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.extensions.ObjectInspector</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -64,7 +64,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.extensions.ObjectInspectorModel</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -74,7 +74,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.extensions.FormController</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -84,7 +84,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.GenericPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -94,7 +94,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.EventHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -104,7 +104,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.XSDValidationPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -114,7 +114,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.CellBindingPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -124,7 +124,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.ButtonNavigationHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -134,7 +134,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.DefaultFormComponentInspectorModel</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index d04ece5dc06f..d05808db2d91 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.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. @@ -28,12 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "pcrcommon.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif /** === begin UNO includes === **/ #include <com/sun/star/util/MeasureUnit.hpp> @@ -76,3 +73,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 69e508ca8d87..528c88d730c9 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.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. @@ -150,3 +151,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_PCRCOMMON_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx index 230580259617..7cec06d7e10c 100644 --- a/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/extensions/source/propctrlr/pcrcommontypes.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,14 +34,14 @@ /** === end UNO includes === **/ #include <rtl/ustring.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> //........................................................................ namespace pcr { //........................................................................ - typedef ::std::hash_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > + typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::beans::Property, ::rtl::OUStringHash > PropertyMap; //........................................................................ @@ -49,3 +50,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrcomponentcontext.cxx b/extensions/source/propctrlr/pcrcomponentcontext.cxx index c998872864b2..dfb80d409e16 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.cxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.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. @@ -78,7 +79,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PropertyHandler::getContextValueByName: caught an exception!" ); + OSL_FAIL( "PropertyHandler::getContextValueByName: caught an exception!" ); } return aReturn; } @@ -104,3 +105,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrcomponentcontext.hxx b/extensions/source/propctrlr/pcrcomponentcontext.hxx index ddec56886137..cf12486be52c 100644 --- a/extensions/source/propctrlr/pcrcomponentcontext.hxx +++ b/extensions/source/propctrlr/pcrcomponentcontext.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. @@ -101,7 +102,7 @@ namespace pcr @throws ::com::sun::star::lang::ServiceNotRegisteredException if the given service is not registered @throws Exception - if an exception occured during creating the component + if an exception occurred during creating the component @return the newly created component. Is never <NULL/>. */ @@ -112,7 +113,7 @@ namespace pcr @throws ::com::sun::star::lang::ServiceNotRegisteredException if the given service is not registered @throws Exception - if an exception occured during creating the component + if an exception occurred during creating the component @return the newly created component. Is never <NULL/>. */ @@ -166,3 +167,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_PCROMPONENTCONTEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src index d547b52ed5ea..eb15e0a033ca 100644 --- a/extensions/source/propctrlr/pcrmiscres.src +++ b/extensions/source/propctrlr/pcrmiscres.src @@ -48,14 +48,6 @@ Resource RID_RSC_BUTTON_IMAGES { ImageBitmap = Bitmap{ file = "buttonminus.png"; }; }; - Image IMG_PLUS_HC - { - ImageBitmap = Bitmap{ file = "buttonplus_hc.png"; }; - }; - Image IMG_MINUS_HC - { - ImageBitmap = Bitmap{ file = "buttonminus_hc.png"; }; - }; }; #define IMAGE_IDS \ @@ -70,7 +62,6 @@ Resource RID_RSC_BUTTON_IMAGES RID_SVXIMG_EDIT; \ RID_SVXIMG_LISTBOX; \ RID_SVXIMG_COMBOBOX; \ - RID_SVXIMG_URLBUTTON; \ RID_SVXIMG_GRID; \ RID_SVXIMG_IMAGEBUTTON; \ RID_SVXIMG_FILECONTROL; \ @@ -100,13 +91,6 @@ ImageList RID_IL_FORMEXPLORER IMAGE_IDS; }; -ImageList RID_IL_FORMEXPLORER_HC -{ - Prefix = "sxh"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; - IMAGE_IDS; -}; - String RID_STR_PROPTITLE_PUSHBUTTON { Text [ en-US ] = "Button" ; diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index e515a87c1b16..d0737e6a6753 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif //--------------------------------------------------------------------------------------- @@ -122,3 +121,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( return xRet.get(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrstrings.cxx b/extensions/source/propctrlr/pcrstrings.cxx index ff7a1138e4fc..7e081ab54db1 100644 --- a/extensions/source/propctrlr/pcrstrings.cxx +++ b/extensions/source/propctrlr/pcrstrings.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. @@ -34,3 +35,4 @@ #undef PCR_IMPLEMENT_STRINGS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrstrings.hxx b/extensions/source/propctrlr/pcrstrings.hxx index e2a81c9920ca..e49577427b3c 100644 --- a/extensions/source/propctrlr/pcrstrings.hxx +++ b/extensions/source/propctrlr/pcrstrings.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. @@ -44,3 +45,4 @@ namespace pcr #endif // _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index e870510c7cc2..20470e4ef802 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.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. @@ -96,7 +97,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.form.ui.OTabOrderDialog" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OTabOrderDialog")); } //--------------------------------------------------------------------- @@ -144,3 +145,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 929b52a5dd67..24390001f491 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.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. @@ -92,3 +93,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 814b7475fbae..dce1d0265fb7 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.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. @@ -31,16 +32,10 @@ #include "pcrstrings.hxx" #include "standardcontrol.hxx" #include "linedescriptor.hxx" -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "propertyeditor.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "formstrings.hxx" #include "formmetadata.hxx" #include "formbrowsertools.hxx" @@ -57,18 +52,17 @@ #include <comphelper/types.hxx> #include <comphelper/extract.hxx> #include <toolkit/awt/vclxwindow.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <comphelper/property.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> #include <algorithm> #include <functional> +#include <sal/macros.h> //------------------------------------------------------------------------ // !!! outside the namespace !!! @@ -289,7 +283,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (com::sun::star::util::VetoException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bSuspendingPropertyHandlers || !suspendAll_nothrow() ) @@ -377,11 +371,11 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) - throw RuntimeException(::rtl::OUString::createFromAscii("Unable to attach to a second frame."),*this); + throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to attach to a second frame.")),*this); // revoke as focus listener from the old container window stopContainerWindowListening(); @@ -397,7 +391,7 @@ namespace pcr VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; if (!pParentWin) - throw RuntimeException(::rtl::OUString::createFromAscii("The frame is invalid. Unable to extract the container window."),*this); + throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The frame is invalid. Unable to extract the container window.")),*this); if ( Construct( pParentWin ) ) { @@ -407,7 +401,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::attachFrame: caught an exception!" ); + OSL_FAIL( "OPropertyBrowserController::attachFrame: caught an exception!" ); } } @@ -476,7 +470,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::suspendPropertyHandlers_nothrow: caught an exception!" ); + OSL_FAIL( "OPropertyBrowserController::suspendPropertyHandlers_nothrow: caught an exception!" ); } } return sal_True; @@ -542,7 +536,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::dispose( ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // stop inspecting the current object stopInspection( false ); @@ -603,14 +597,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.ObjectInspector"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.ObjectInspector")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.inspection.ObjectInspector" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.ObjectInspector")); return aSupported; } @@ -754,7 +748,7 @@ namespace pcr { if ( _rEvent.Source == m_xModel ) { - if ( _rEvent.PropertyName.equalsAscii( "IsReadOnly" ) ) + if ( _rEvent.PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) ) impl_updateReadOnlyView_nothrow(); return; } @@ -996,7 +990,7 @@ namespace pcr catch(Exception&) { - DBG_ERROR("OPropertyBrowserController::impl_rebindToInspectee_nothrow: caught an exception !"); + OSL_FAIL("OPropertyBrowserController::impl_rebindToInspectee_nothrow: caught an exception !"); } } @@ -1127,7 +1121,7 @@ namespace pcr } catch(Exception&) { - DBG_ERROR("OPropertyBrowserController::doInspection : caught an exception !"); + OSL_FAIL("OPropertyBrowserController::doInspection : caught an exception !"); } } @@ -1198,7 +1192,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::describePropertyLine: caught an exception!" ); + OSL_FAIL( "OPropertyBrowserController::describePropertyLine: caught an exception!" ); } } @@ -1263,7 +1257,7 @@ namespace pcr ::rtl::OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" ); sMessage += ::rtl::OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() ); sMessage += "'!"; - OSL_ENSURE( false, sMessage ); + OSL_FAIL( sMessage ); } #endif // finally insert this property control @@ -1371,7 +1365,7 @@ namespace pcr // also okay, we expect that the handler has disabled the UI as necessary break; default: - OSL_ENSURE( false, "OPropertyBrowserController::Clicked: unknown result value!" ); + OSL_FAIL( "OPropertyBrowserController::Clicked: unknown result value!" ); break; } } @@ -1447,7 +1441,7 @@ namespace pcr } catch(Exception&) { - DBG_ERROR("OPropertyBrowserController::Commit : caught an exception !"); + OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !"); } m_sCommittingProperty = ::rtl::OUString(); @@ -1512,7 +1506,7 @@ namespace pcr ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface( m_pView ) ) ) }; xHandlerContext = ::cppu::createComponentContext( - aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), + aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), m_aContext.getUNOContext() ); } @@ -1596,7 +1590,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "OPropertyBrowserController::rebuildPropertyUI: caught an exception!" ); + OSL_FAIL( "OPropertyBrowserController::rebuildPropertyUI: caught an exception!" ); } getPropertyBox().ChangeEntry( aDescriptor ); @@ -1730,7 +1724,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::setHelpSectionText( const ::rtl::OUString& _rHelpText ) throw (NoSupportException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1776,3 +1770,4 @@ namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 4cc77e88c78e..70bcba95ad90 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.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. @@ -34,9 +35,7 @@ #include "proplinelistener.hxx" #include "propcontrolobserver.hxx" #include "browserview.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_ #include "modulepcr.hxx" -#endif #include "propertyinfo.hxx" #include "pcrcomponentcontext.hxx" @@ -56,7 +55,6 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/awt/XLayoutConstrains.hpp> -#include <com/sun/star/awt/XLayoutConstrains.hpp> #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/inspection/XPropertyControlFactory.hpp> #include <com/sun/star/inspection/XObjectInspector.hpp> @@ -70,7 +68,7 @@ #include <comphelper/broadcasthelper.hxx> #include <map> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <memory> @@ -139,9 +137,9 @@ namespace pcr typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > PropertyHandlerRef; typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray; - typedef ::std::hash_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_map< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > PropertyHandlerRepository; - typedef ::std::hash_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > + typedef ::boost::unordered_multimap< ::rtl::OUString, PropertyHandlerRef, ::rtl::OUStringHash > PropertyHandlerMultiRepository; PropertyHandlerRepository m_aPropertyHandlers; PropertyHandlerMultiRepository m_aDependencyHandlers; @@ -159,7 +157,7 @@ namespace pcr /// the property we're just committing ::rtl::OUString m_sCommittingProperty; - typedef ::std::hash_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; + typedef ::boost::unordered_map< ::rtl::OUString, sal_uInt16, ::rtl::OUStringHash > HashString2Int16; HashString2Int16 m_aPageIds; bool m_bContainerFocusListening; @@ -428,3 +426,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_PROPCONTROLLER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx index 65bfe7ee0233..d1d48ab8b80a 100644 --- a/extensions/source/propctrlr/propcontrolobserver.hxx +++ b/extensions/source/propctrlr/propcontrolobserver.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. @@ -54,3 +55,4 @@ namespace pcr #endif // PROPCONTROLOBSERVER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index 3cca2b1553d3..d8b97c0c9faf 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.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. @@ -354,7 +355,7 @@ namespace pcr case InteractiveSelectionResult_Success: case InteractiveSelectionResult_Pending: - OSL_ENSURE( false, "PropertyComposer::onInteractivePropertySelection: no chance to forward the new value to the other handlers!" ); + OSL_FAIL( "PropertyComposer::onInteractivePropertySelection: no chance to forward the new value to the other handlers!" ); // This means that we cannot know the new property value, which either has already been set // at the first component ("Success"), or will be set later on once the asynchronous input // is finished ("Pending"). So, we also cannot forward this new property value to the other @@ -371,7 +372,7 @@ namespace pcr break; default: - OSL_ENSURE( false, "OPropertyBrowserController::onInteractivePropertySelection: unknown result value!" ); + OSL_FAIL( "OPropertyBrowserController::onInteractivePropertySelection: unknown result value!" ); break; } @@ -514,3 +515,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 4a67c1da9e6d..b1d5cbedbe9c 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.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. @@ -29,7 +30,6 @@ #define EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX #include "pcrcommon.hxx" -#include "formbrowsertools.hxx" #include "composeduiupdate.hxx" #include "formbrowsertools.hxx" @@ -155,3 +155,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx index d06ab54e0a79..49e352331812 100644 --- a/extensions/source/propctrlr/propertycontrolextender.cxx +++ b/extensions/source/propctrlr/propertycontrolextender.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,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -#ifndef EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX #include "propertycontrolextender.hxx" -#endif /** === begin UNO includes === **/ #include <com/sun/star/awt/KeyFunction.hpp> @@ -143,3 +142,5 @@ namespace pcr //........................................................................ } // namespace pcr //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index 0e74284c6f9b..7346d0b8b1af 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.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. * @@ -72,3 +73,5 @@ namespace pcr //........................................................................ #endif // EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 64be3ae20e9f..8a11e023df3d 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.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. @@ -540,3 +541,4 @@ namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 6affea7376d3..6f9217f7329c 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.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. @@ -161,3 +162,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_PROPERTYEDITOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index ba40fabdcd17..c3fe86810dba 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.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. @@ -247,14 +248,14 @@ namespace pcr //-------------------------------------------------------------------- InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { - DBG_ERROR( "PropertyHandler::onInteractivePropertySelection: not implemented!" ); + OSL_FAIL( "PropertyHandler::onInteractivePropertySelection: not implemented!" ); return InteractiveSelectionResult_Cancelled; } //-------------------------------------------------------------------- void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { - DBG_ERROR( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); + OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); } //-------------------------------------------------------------------- @@ -462,3 +463,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 073debdccda5..1fffc177b82f 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.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. @@ -30,9 +31,7 @@ #include "pcrcomponentcontext.hxx" #include "pcrcommon.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_ #include "modulepcr.hxx" -#endif /** === begin UNO includes === **/ #include <com/sun/star/uno/XComponentContext.hpp> @@ -455,3 +454,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 3e188c25fe06..64e9b3f8ffed 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.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. @@ -64,3 +65,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_PROPERTYINFO_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx index f82d81e75172..6ab21e547289 100644 --- a/extensions/source/propctrlr/propeventtranslation.cxx +++ b/extensions/source/propctrlr/propeventtranslation.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. @@ -103,3 +104,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index e10ab99d2e2b..284855e2c413 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.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. @@ -82,3 +83,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index 143483a6b9fd..79eeaee28962 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.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. @@ -49,3 +50,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx index 3894825d603d..ed546e700ae2 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.cxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.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. @@ -102,7 +103,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::PushButtonNavigation: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::PushButtonNavigation: caught an exception!" ); } } @@ -141,7 +142,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::getCurrentButtonType: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::getCurrentButtonType: caught an exception!" ); } return aReturn; } @@ -173,7 +174,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::setCurrentButtonType: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::setCurrentButtonType: caught an exception!" ); } } @@ -205,7 +206,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::getCurrentButtonTypeState: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::getCurrentButtonTypeState: caught an exception!" ); } return eState; @@ -236,7 +237,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::getCurrentTargetURL: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::getCurrentTargetURL: caught an exception!" ); } return aReturn; } @@ -253,7 +254,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::setCurrentTargetURL: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::setCurrentTargetURL: caught an exception!" ); } } @@ -272,7 +273,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "PushButtonNavigation::setCurrentTargetURL: caught an exception!" ); + OSL_FAIL( "PushButtonNavigation::setCurrentTargetURL: caught an exception!" ); } return eState; @@ -304,3 +305,5 @@ namespace pcr //............................................................................ } // namespace pcr //............................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx index e53de6fb2139..d192326279d9 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.hxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.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. @@ -106,3 +107,5 @@ namespace pcr //............................................................................ #endif // EXTENSIONS_PROPCTRLR_PUSHBUTTONNAVIGATION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 5fbbe57dc11b..d09cc94b050a 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "selectlabeldialog.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_FORMRESID_HRC_ #include "formresid.hrc" -#endif #include "formbrowsertools.hxx" #include "formstrings.hxx" #include <com/sun/star/form/FormComponentType.hpp> @@ -311,3 +310,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 27294a0f9977..c455f48e1c68 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.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. @@ -30,15 +31,11 @@ #include <vcl/fixed.hxx> #include <svtools/svtreebx.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/image.hxx> #include <vcl/dialog.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif //............................................................................ namespace pcr @@ -89,3 +86,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_SELECTLABELDIALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 294945f77f2d..1e0e2e865d34 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.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. @@ -29,12 +30,8 @@ #include "precompiled_extensions.hxx" #include "sqlcommanddesign.hxx" #include "formstrings.hxx" -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "unourl.hxx" /** === begin UNO includes === **/ @@ -391,3 +388,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index 72dea2b20f74..592bdc91fd04 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.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. @@ -221,3 +222,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index cd38db9c9944..c8217a734fae 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.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. @@ -43,9 +44,7 @@ //================================================================== // ugly dependencies for the OColorControl -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/drawitem.hxx> #include <svx/xtable.hxx> //================================================================== @@ -55,9 +54,7 @@ #include <unotools/syslocale.hxx> #include <unotools/datetime.hxx> #include <i18npool/mslangid.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/svapp.hxx> //================================================================== @@ -593,7 +590,7 @@ namespace pcr // everything which survived the checks above should result in a factor of 1, i.e., // it should have a direct counterpart as FieldUnit throw RuntimeException(); - getTypedControlWindow()->SetUnit( eFieldUnit ); + getTypedControlWindow()->MetricFormatter::SetUnit( eFieldUnit ); } //-------------------------------------------------------------------- @@ -1440,3 +1437,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 9ee46e110bc6..c480b508cd25 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.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. @@ -443,3 +444,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_STANDARDCONTROL_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/stlops.hxx b/extensions/source/propctrlr/stlops.hxx index 36511582618b..3ac44fcf32d6 100644 --- a/extensions/source/propctrlr/stlops.hxx +++ b/extensions/source/propctrlr/stlops.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. @@ -68,3 +69,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_STLOPS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/stringdefine.hxx b/extensions/source/propctrlr/stringdefine.hxx index 3d31011d13b0..e5a27caa34f8 100644 --- a/extensions/source/propctrlr/stringdefine.hxx +++ b/extensions/source/propctrlr/stringdefine.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. @@ -97,3 +98,4 @@ namespace pcr #endif // _EXTENSIONS_FORMSCTRLR_STRINGDEFINE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 2897ba57d9e6..318b14293d6f 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.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. @@ -43,19 +44,12 @@ #include <com/sun/star/util/Time.hpp> #include <comphelper/sequence.hxx> #include <connectivity/dbconversion.hxx> -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ -#include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include <tools/debug.hxx> #include <tools/string.hxx> #include <tools/StringListResource.hxx> #include <comphelper/types.hxx> -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_ #include "modulepcr.hxx" -#endif #include <functional> #include <algorithm> @@ -187,7 +181,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedSer ::rtl::OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" ); sMessage += ::rtl::OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( "'!" ); - DBG_ERROR( sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); } #endif } @@ -232,7 +226,7 @@ uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUSt ::rtl::OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" ); sMessage += ::rtl::OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ::rtl::OString( "'!" ); - DBG_ERROR( sMessage.getStr() ); + OSL_FAIL( sMessage.getStr() ); } #endif } @@ -434,7 +428,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, // some structs case uno::TypeClass_STRUCT: - OSL_ENSURE( false, "StringRepresentation::convertGenericValueToString(STRUCT): this is dead code - isn't it?" ); + OSL_FAIL( "StringRepresentation::convertGenericValueToString(STRUCT): this is dead code - isn't it?" ); if ( _rValue.getValueType().equals( ::getCppuType( static_cast< util::Date* >( NULL ) ) ) ) { // weird enough, the string representation of dates, as used @@ -578,7 +572,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _ break; case uno::TypeClass_STRUCT: - OSL_ENSURE( false, "StringRepresentation::convertStringToGenericValue(STRUCT): this is dead code - isn't it?" ); + OSL_FAIL( "StringRepresentation::convertStringToGenericValue(STRUCT): this is dead code - isn't it?" ); if ( _rTargetType.equals( ::getCppuType( static_cast< util::Date* >( NULL ) ) ) ) { // weird enough, the string representation of dates, as used @@ -648,3 +642,4 @@ extern "C" void SAL_CALL createRegistryInfo_StringRepresentation() ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index c2c56a6d2ad6..211d021361e0 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.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. @@ -90,7 +91,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SubmissionHelper::canTriggerSubmissions: caught an exception!" ); + OSL_FAIL( "SubmissionHelper::canTriggerSubmissions: caught an exception!" ); } return false; } @@ -166,13 +167,13 @@ namespace pcr break; default: - DBG_ERROR( "SubmissionPropertyHandler::getPropertyValue: cannot handle this property!" ); + OSL_FAIL( "SubmissionPropertyHandler::getPropertyValue: cannot handle this property!" ); break; } } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::getPropertyValue: caught an exception!" ); + OSL_FAIL( "SubmissionPropertyHandler::getPropertyValue: caught an exception!" ); } return aReturn; @@ -212,12 +213,12 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::setPropertyValue: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::setPropertyValue: cannot handle this id!" ); } } catch( const Exception& ) { - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::setPropertyValue: caught an exception!" ); + OSL_FAIL( "SubmissionPropertyHandler::setPropertyValue: caught an exception!" ); } } @@ -317,7 +318,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::describePropertyLine: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::describePropertyLine: cannot handle this id!" ); return LineDescriptor(); } @@ -351,7 +352,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::actuatingPropertyChanged: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::actuatingPropertyChanged: cannot handle this id!" ); } } @@ -388,7 +389,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::convertToPropertyValue: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::convertToPropertyValue: cannot handle this id!" ); } return aPropertyValue; @@ -429,7 +430,7 @@ namespace pcr break; default: - OSL_ENSURE( sal_False, "SubmissionPropertyHandler::convertToControlValue: cannot handle this id!" ); + OSL_FAIL( "SubmissionPropertyHandler::convertToControlValue: cannot handle this id!" ); } return aControlValue; @@ -446,3 +447,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index c2c19ecfb4d9..0ee0e8df8a03 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.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. @@ -123,3 +124,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_SUBMISSIONHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index c3e0268bbc7a..fa7e03149137 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.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. @@ -28,16 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" #include "taborder.hxx" -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HRC #include "taborder.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "formstrings.hxx" #include <comphelper/types.hxx> #include <comphelper/property.hxx> @@ -111,9 +106,7 @@ namespace pcr aPB_OK.SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) ); aPB_OK.Disable(); - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - pImageList = new ImageList( PcrRes( bIsHighContrast ? RID_IL_FORMEXPLORER_HC : RID_IL_FORMEXPLORER ) ); - + pImageList = new ImageList( PcrRes( RID_IL_FORMEXPLORER ) ); if ( m_xModel.is() ) m_xTempModel = new OSimpleTabModel( m_xModel->getControlModels() ); @@ -178,7 +171,7 @@ namespace pcr case FormComponentType::SPINBUTTON: nImageId = RID_SVXIMG_SPINBUTTON; break; case FormComponentType::NAVIGATIONBAR: nImageId = RID_SVXIMG_NAVIGATIONBAR; break; default: - DBG_ERROR( "TabOrderDialog::GetImage: unknown control type" ); + OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" ); } } @@ -222,7 +215,7 @@ namespace pcr else { // no property set -> no tab order - DBG_ERROR( "TabOrderDialog::FillList: invalid control encountered!" ); + OSL_FAIL( "TabOrderDialog::FillList: invalid control encountered!" ); aLB_Controls.Clear(); break; } @@ -230,7 +223,7 @@ namespace pcr } catch( const Exception& ) { - DBG_ERROR( "TabOrderDialog::FillList: caught an exception!" ); + OSL_FAIL( "TabOrderDialog::FillList: caught an exception!" ); } // select first entry @@ -276,7 +269,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "TabOrderDialog::AutoOrderClickHdl: caught an exception!" ); + OSL_FAIL( "TabOrderDialog::AutoOrderClickHdl: caught an exception!" ); } return 0; @@ -307,9 +300,7 @@ namespace pcr } // TODO: UNO action (to bracket all the single actions which are being created) -// pDrawModel->BegUndo(PcrRes(RID_STR_UNDO_TABORDER)); m_xModel->setControlModels( aSortedControlModelSeq ); -// pDrawModel->EndUndo(); EndDialog( sal_True ); return 0; @@ -422,3 +413,5 @@ namespace pcr //............................................................................ } // namespace pcr //............................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 392df3f682eb..e10416376704 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.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,22 +34,13 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _TOOLS_LIST_HXX -#include <tools/list.hxx> -#endif #include <comphelper/uno3.hxx> //............................................................................ @@ -130,3 +122,5 @@ namespace pcr //............................................................................ #endif // EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx index 09e124d6593b..5e73bef47f1c 100644 --- a/extensions/source/propctrlr/unourl.cxx +++ b/extensions/source/propctrlr/unourl.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. @@ -60,7 +61,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "UnoURL::UnoURL: caught an exception!" ); + OSL_FAIL( "UnoURL::UnoURL: caught an exception!" ); } } @@ -68,3 +69,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index 86298ca3a42f..e9eebdd6e409 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.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. @@ -63,3 +64,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_UNOURL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index e168fd0da830..f1ccab670cb3 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.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. @@ -31,7 +32,6 @@ /** === begin UNO includes === **/ #include <com/sun/star/inspection/PropertyControlType.hpp> -#include <com/sun/star/inspection/PropertyControlType.hpp> /** === end UNO includes === **/ #include <svl/numuno.hxx> #include <rtl/math.hxx> @@ -368,3 +368,4 @@ namespace pcr } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 82835d1df16e..d5965600ae34 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.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. @@ -170,3 +171,4 @@ namespace pcr #endif // _EXTENSIONS_PROPCTRLR_USERCONTROL_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx index 25a77840c6a7..c536c6f98f9a 100644 --- a/extensions/source/propctrlr/xsddatatypes.cxx +++ b/extensions/source/propctrlr/xsddatatypes.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. @@ -59,7 +60,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType: setSave: caught an exception!" ); + OSL_FAIL( "XSDDataType: setSave: caught an exception!" ); } } @@ -74,7 +75,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType: getSave: caught an exception!" ); + OSL_FAIL( "XSDDataType: getSave: caught an exception!" ); } return aReturn; } @@ -89,7 +90,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType: getFacet: caught an exception!" ); + OSL_FAIL( "XSDDataType: getFacet: caught an exception!" ); } return aReturn; } @@ -140,7 +141,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::classify: caught an exception!" ); + OSL_FAIL( "XSDDataType::classify: caught an exception!" ); } return nTypeClass; } @@ -166,7 +167,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::setFacet: caught an exception - sure this is the right data type class for this property?" ); + OSL_FAIL( "XSDDataType::setFacet: caught an exception - sure this is the right data type class for this property?" ); } } @@ -180,7 +181,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::hasFacet: caught an exception!" ); + OSL_FAIL( "XSDDataType::hasFacet: caught an exception!" ); } return bReturn; } @@ -194,7 +195,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::getFacet: caught an exception - sure this is the right data type class for this property?" ); + OSL_FAIL( "XSDDataType::getFacet: caught an exception - sure this is the right data type class for this property?" ); } return aReturn; } @@ -240,7 +241,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDDataType::copyFacetsFrom: caught an exception!" ); + OSL_FAIL( "XSDDataType::copyFacetsFrom: caught an exception!" ); } } @@ -248,3 +249,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index 8bb722d3990a..c2015aa3a39c 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.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. @@ -112,3 +113,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index f203b36bcffa..d0fdac11ccd1 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.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. @@ -81,7 +82,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::XSDValidationHelper: caught an exception while examining the introspectee!" ); + OSL_FAIL( "XSDValidationHelper::XSDValidationHelper: caught an exception while examining the introspectee!" ); } } @@ -102,7 +103,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::getAvailableDataTypeNames: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::getAvailableDataTypeNames: caught an exception!" ); } } @@ -159,7 +160,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::getValidatingDataTypeName: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::getValidatingDataTypeName: caught an exception!" ); } return sDataTypeName; } @@ -181,7 +182,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::getDataTypeByName: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::getDataTypeByName: caught an exception!" ); } return pReturn; @@ -216,7 +217,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::cloneDataType: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::cloneDataType: caught an exception!" ); } return true; } @@ -233,7 +234,7 @@ namespace pcr if ( !xRepository->hasByName( _rName ) ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::removeDataTypeFromRepository: invalid repository and/or data type!" ); + OSL_FAIL( "XSDValidationHelper::removeDataTypeFromRepository: invalid repository and/or data type!" ); return false; } @@ -241,7 +242,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::removeDataTypeFromRepository: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::removeDataTypeFromRepository: caught an exception!" ); return false; } return true; @@ -321,7 +322,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::copyDataType: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::copyDataType: caught an exception!" ); } } @@ -373,7 +374,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::findDefaultFormatForIntrospectee: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::findDefaultFormatForIntrospectee: caught an exception!" ); } } @@ -400,7 +401,7 @@ namespace pcr } catch( const Exception& ) { - OSL_ENSURE( sal_False, "XSDValidationHelper::getBasicTypeNameForClass: caught an exception!" ); + OSL_FAIL( "XSDValidationHelper::getBasicTypeNameForClass: caught an exception!" ); } return sReturn; @@ -410,3 +411,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx index 6eb7d8caae61..e3881cdbcbe9 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.hxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.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. @@ -148,3 +149,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index a7a6844973ea..21ef4cc600fa 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.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. @@ -52,6 +53,7 @@ #include <vcl/msgbox.hxx> #include <tools/debug.hxx> #include <svtools/localresaccess.hxx> +#include <sal/macros.h> #include <algorithm> #include <functional> @@ -161,7 +163,7 @@ namespace pcr ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType(); if ( !pType.is() ) { - DBG_ERROR( "XSDValidationPropertyHandler::setPropertyValue: you're trying to set a type facet, without a current type!" ); + OSL_FAIL( "XSDValidationPropertyHandler::setPropertyValue: you're trying to set a type facet, without a current type!" ); return; } @@ -413,7 +415,7 @@ namespace pcr break; default: - DBG_ERROR( "XSDValidationPropertyHandler::describePropertyLine: cannot handle this property!" ); + OSL_FAIL( "XSDValidationPropertyHandler::describePropertyLine: cannot handle this property!" ); break; } @@ -469,7 +471,7 @@ namespace pcr break; default: - DBG_ERROR( "XSDValidationPropertyHandler::onInteractivePropertySelection: unexpected property to build a dedicated UI!" ); + OSL_FAIL( "XSDValidationPropertyHandler::onInteractivePropertySelection: unexpected property to build a dedicated UI!" ); break; } return InteractiveSelectionResult_Cancelled; @@ -501,7 +503,7 @@ namespace pcr ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType(); if ( !pType.is() ) { - DBG_ERROR( "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: invalid current data type!" ); + OSL_FAIL( "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: invalid current data type!" ); return false; } @@ -540,7 +542,7 @@ namespace pcr ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType(); if ( !pType.is() ) { - DBG_ERROR( "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: invalid current data type!" ); + OSL_FAIL( "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: invalid current data type!" ); return false; } @@ -628,7 +630,7 @@ namespace pcr size_t i=0; const ::rtl::OUString* pLoop = NULL; for ( i = 0, pLoop = aFacets; - i < sizeof( aFacets ) / sizeof( aFacets[0] ); + i < SAL_N_ELEMENTS( aFacets ); ++i, ++pLoop ) { @@ -654,7 +656,7 @@ namespace pcr break; default: - DBG_ERROR( "XSDValidationPropertyHandler::actuatingPropertyChanged: cannot handle this property!" ); + OSL_FAIL( "XSDValidationPropertyHandler::actuatingPropertyChanged: cannot handle this property!" ); return; } @@ -690,3 +692,4 @@ namespace pcr } // namespace pcr //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index e78a33096b32..9bcf9e4dd3e4 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.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. @@ -101,3 +102,4 @@ namespace pcr #endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONPROPERTYHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 6a9d6f338c06..ee5cc2a0ea3f 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.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. @@ -446,7 +447,7 @@ namespace res Sequence< ::rtl::OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( false, "OpenOfficeResourceBundle::getElementNames: not implemented!" ); + OSL_FAIL( "OpenOfficeResourceBundle::getElementNames: not implemented!" ); // the (Simple)ResManager does not provide an API to enumerate the resources return Sequence< ::rtl::OUString >( ); } @@ -477,7 +478,7 @@ namespace res ::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasElements( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( false, "OpenOfficeResourceBundle::hasElements: not implemented!" ); + OSL_FAIL( "OpenOfficeResourceBundle::hasElements: not implemented!" ); // the (Simple)ResManager does not provide an API to enumerate the resources return ::sal_Bool( ); } @@ -487,3 +488,5 @@ namespace res //........................................................................ #endif // EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_CXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/res_services.cxx b/extensions/source/resource/res_services.cxx index 7bdc684294ea..6e88dafc8b9d 100644 --- a/extensions/source/resource/res_services.cxx +++ b/extensions/source/resource/res_services.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. @@ -84,3 +85,5 @@ void * SAL_CALL component_getFactory( } } // extern "C" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/res_services.hxx b/extensions/source/resource/res_services.hxx index c62d9e6e495c..ac61f0e423ac 100644 --- a/extensions/source/resource/res_services.hxx +++ b/extensions/source/resource/res_services.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. @@ -62,3 +63,5 @@ namespace res //........................................................................ #endif // EXTENSIONS_RESOURCE_SERVICES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx index c939baf668c5..01943a68fceb 100644 --- a/extensions/source/resource/resource.cxx +++ b/extensions/source/resource/resource.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. @@ -29,7 +30,7 @@ #include "precompiled_extensions.hxx" #include "res_services.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type #include <cppuhelper/factory.hxx> // helper for factories #include <cppuhelper/implbase3.hxx> // helper for implementations @@ -50,8 +51,6 @@ #include <rtl/ustring.hxx> #include <rtl/strbuf.hxx> -using namespace vos; -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; @@ -59,6 +58,11 @@ using namespace com::sun::star::script; using namespace com::sun::star::beans; using namespace com::sun::star::reflection; +using ::rtl::OUString; +using ::rtl::OStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; + //------------------------------------------------------------------------ //------------------------------------------------------------------------ //------------------------------------------------------------------------ @@ -156,7 +160,7 @@ Sequence< OUString > ResourceService::getSupportedServiceNames_Static(void) thro // ResourceService Reference< XTypeConverter > ResourceService::getTypeConverter() const { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( xSMgr.is() ) { Reference< XTypeConverter > xConv( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter" ))), UNO_QUERY ); @@ -168,11 +172,11 @@ Reference< XTypeConverter > ResourceService::getTypeConverter() const // ResourceService Reference< XInvocation > ResourceService::getDefaultInvocation() const { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; /* f�hrt zur Zeit noch zu einer rekursion if( xSMgr.is() ) { - Reference< XSingleServiceFactory > xFact( xSMgr->createInstance( OUString::createFromAscii("com.sun.star.script.Invocation") ), UNO_QUERY ); + Reference< XSingleServiceFactory > xFact( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Invocation")) ), UNO_QUERY ); if( xFact.is() ) { Sequence< Any > aArgs( 1 ); @@ -191,19 +195,19 @@ OUString SAL_CALL ResourceService::getExactName( const OUString & Approximate { OUString aName( ApproximateName ); aName = aName.toAsciiLowerCase(); - if( aName.equalsAscii("filename") ) + if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("filename")) ) return OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")); - else if( aName.equalsAscii("getstring" )) + else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getstring" ) )) return OUString(RTL_CONSTASCII_USTRINGPARAM("getString")); - else if( aName.equalsAscii("getstrings" )) + else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getstrings" ) )) return OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")); - else if( aName.equalsAscii("hasstring") ) + else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasstring")) ) return OUString(RTL_CONSTASCII_USTRINGPARAM("hasString")); - else if( aName.equalsAscii("hasstrings") ) + else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasstrings")) ) return OUString(RTL_CONSTASCII_USTRINGPARAM("hasStrings")); - else if( aName.equalsAscii("getstringlist") ) + else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getstringlist")) ) return OUString(RTL_CONSTASCII_USTRINGPARAM("getStringList")); - else if( aName.equalsAscii("hasStringList") ) + else if( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasStringList")) ) return OUString(RTL_CONSTASCII_USTRINGPARAM("hasStringList")); Reference< XExactName > xEN( getDefaultInvocation(), UNO_QUERY ); if( xEN.is() ) @@ -232,16 +236,16 @@ Any SAL_CALL ResourceService::invoke throw(IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException) { Any aRet; - if( FunctionName.equalsAscii("getString") - || FunctionName.equalsAscii("getStrings" ) - || FunctionName.equalsAscii("hasString" ) - || FunctionName.equalsAscii("hasStrings" ) + if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString")) + || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getStrings" ) ) + || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hasString" ) ) + || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hasStrings" ) ) ) { sal_Int32 nElements = Params.getLength(); if( nElements < 1 ) throw IllegalArgumentException(); - if( nElements > 1 && (FunctionName.equalsAscii("getString") || FunctionName.equalsAscii("hasString") ) ) + if( nElements > 1 && (FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString")) || FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasString")) ) ) throw IllegalArgumentException(); if( !pResMgr ) throw IllegalArgumentException(); @@ -253,9 +257,9 @@ Any SAL_CALL ResourceService::invoke sal_Bool* pOutBool = aBools.getArray(); Reference< XTypeConverter > xC = getTypeConverter(); - bool bGetBranch = FunctionName.equalsAscii( "getString" ) || FunctionName.equalsAscii( "getStrings" ); + bool bGetBranch = FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getString" ) ) || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getStrings" ) ); - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for( sal_Int32 n = 0; n < nElements; n++ ) { sal_Int32 nId = 0; @@ -295,21 +299,21 @@ Any SAL_CALL ResourceService::invoke pOutBool[n] = bRet; } } - if( FunctionName.equalsAscii("getString") ) + if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString")) ) aRet <<= pOutString[0]; - else if( FunctionName.equalsAscii("getStrings" ) ) + else if( FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("getStrings" ) ) ) aRet <<= aStrings; - else if( FunctionName.equalsAscii("hasString" ) ) + else if( FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hasString" ) ) ) aRet <<= pOutBool[0]; else aRet <<= aBools; } - else if( FunctionName.equalsAscii("getStringList") || FunctionName.equalsAscii("hasStringList" ) ) + else if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStringList")) || FunctionName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hasStringList" ) ) ) { if( Params.getLength() != 1 ) throw IllegalArgumentException(); Reference< XTypeConverter > xC = getTypeConverter(); - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_Int32 nId = 0; if( !(Params.getConstArray()[0] >>= nId) ) @@ -322,7 +326,7 @@ Any SAL_CALL ResourceService::invoke throw CannotConvertException(); } - if( FunctionName.equalsAscii("getStringList") ) + if( FunctionName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStringList")) ) { ResId aId( (sal_uInt16)nId, *pResMgr ); aId.SetRT( RSC_STRINGARRAY ); @@ -371,7 +375,7 @@ Any SAL_CALL ResourceService::invoke void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any& Value) throw(UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException) { - if( PropertyName.equalsAscii("FileName") ) + if( PropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")) ) { OUString aName; if( !(Value >>= aName) ) @@ -383,7 +387,7 @@ void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any& throw CannotConvertException(); } - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; OStringBuffer aBuf( aName.getLength()+8 ); aBuf.append( OUStringToOString( aName, osl_getThreadTextEncoding() ) ); ResMgr * pRM = ResMgr::CreateResMgr( aBuf.getStr() ); @@ -408,8 +412,8 @@ void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any& Any SAL_CALL ResourceService::getValue(const OUString& PropertyName) throw(UnknownPropertyException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); - if( PropertyName.equalsAscii("FileName" )) + SolarMutexGuard aGuard; + if( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("FileName" ) )) return makeAny( aFileName ); Reference< XInvocation > xI = getDefaultInvocation(); @@ -423,12 +427,12 @@ Any SAL_CALL ResourceService::getValue(const OUString& PropertyName) sal_Bool SAL_CALL ResourceService::hasMethod(const OUString& Name) throw(RuntimeException) { - if( Name.equalsAscii("getString") || - Name.equalsAscii("getStrings") || - Name.equalsAscii("hasString") || - Name.equalsAscii("hasStrings") || - Name.equalsAscii("getStringList") || - Name.equalsAscii("hasStringList") + if( Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getString")) || + Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStrings")) || + Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasString")) || + Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasStrings")) || + Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("getStringList")) || + Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("hasStringList")) ) return sal_True; else @@ -445,7 +449,7 @@ sal_Bool SAL_CALL ResourceService::hasMethod(const OUString& Name) sal_Bool SAL_CALL ResourceService::hasProperty(const OUString& Name) throw(RuntimeException) { - if( Name.equalsAscii("FileName") ) + if( Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")) ) return sal_True; else { @@ -469,3 +473,4 @@ namespace res } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 6079d153cffc..d0b76ce4c0e6 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.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. @@ -606,3 +607,5 @@ IMPL_LINK( GridWindow, ClickButtonHdl, Button*, pButton ) } return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index c5d4a14ed4e9..15ce28430cdc 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.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. @@ -28,9 +29,7 @@ #define _EXTENSIONS_SCANNER_GRID_HXX #include <vcl/window.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/dialog.hxx> @@ -147,3 +146,5 @@ public: }; #endif // _EXTENSIONS_SCANNER_GRID_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk index 519be1ff863d..32112ddc8919 100644 --- a/extensions/source/scanner/makefile.mk +++ b/extensions/source/scanner/makefile.mk @@ -70,20 +70,16 @@ SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(ONELIB) \ $(TOOLSLIB) \ $(VCLLIB) \ $(SVTOOLLIB) -.IF "$(GUI)"=="UNX" -.IF "$(OS)"!="FREEBSD" -.IF "$(OS)"!="NETBSD" +.IF "$(GUI)"=="UNX" && "$(OS)"!="FREEBSD" && \ + "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" SHL1STDLIBS+=$(SVTOOLLIB) -ldl .ENDIF -.ENDIF -.ENDIF SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 0ca6884e8202..8f0be90e00c8 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.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. @@ -38,6 +39,7 @@ #include <sys/time.h> #include <sys/types.h> #include <sal/config.h> +#include <sal/macros.h> #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL #include <stdarg.h> @@ -158,7 +160,6 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction, pAction ); } #endif -// if( nInfo & ( SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS ) ) if( nInfo & SANE_INFO_RELOAD_OPTIONS ) ReloadOptions(); return nStatus; @@ -186,17 +187,17 @@ Sane::~Sane() void Sane::Init() { - ::rtl::OUString sSaneLibName( ::rtl::OUString::createFromAscii( "libsane" SAL_DLLEXTENSION ) ); + ::rtl::OUString sSaneLibName( RTL_CONSTASCII_USTRINGPARAM( "libsane" SAL_DLLEXTENSION ) ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); if( ! pSaneLib ) { - sSaneLibName = ::rtl::OUString::createFromAscii( "libsane" SAL_DLLEXTENSION ".1" ); + sSaneLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "libsane" SAL_DLLEXTENSION ".1" )); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } // try reasonable places that might not be in the library search path if( ! pSaneLib ) { - ::rtl::OUString sSaneLibSystemPath( ::rtl::OUString::createFromAscii( "/usr/local/lib/libsane" SAL_DLLEXTENSION ) ); + ::rtl::OUString sSaneLibSystemPath( RTL_CONSTASCII_USTRINGPARAM( "/usr/local/lib/libsane" SAL_DLLEXTENSION ) ); osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData, &sSaneLibName.pData ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } @@ -988,7 +989,7 @@ String Sane::GetOptionUnitName( int n ) String aText; SANE_Unit nUnit = mppOptions[n]->unit; size_t nUnitAsSize = (size_t)nUnit; - if( nUnitAsSize > sizeof( ppUnits )/sizeof( ppUnits[0] ) ) + if( nUnitAsSize > SAL_N_ELEMENTS( ppUnits ) ) aText = String::CreateFromAscii( "[unknown units]" ); else aText = String( ppUnits[ nUnit ], gsl_getSystemTextEncoding() ); @@ -1002,3 +1003,5 @@ sal_Bool Sane::ActivateButtonOption( int n ) return sal_False; return sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 2b6683477b56..fe5a63477cf2 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.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. @@ -41,7 +42,7 @@ class BitmapTransporter : public OWeakObject, AWT::XBitmap { SvMemoryStream m_aStream; - vos::OMutex m_aProtector; + osl::Mutex m_aProtector; public: @@ -198,3 +199,5 @@ inline Link Sane::SetReloadOptionsHdl( const Link& rLink ) } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index fc8119c07b4c..f90bb6c20492 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.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. @@ -37,9 +38,7 @@ #include <sanedlg.hrc> #include <grid.hxx> #include <math.h> - -#define USE_SAVE_STATE -#undef SAVE_ALL_STATES +#include <sal/macros.h> ResId SaneResId( sal_uInt32 nID ) { @@ -132,6 +131,7 @@ SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) : SaneDlg::~SaneDlg() { + mrSane.SetReloadOptionsHdl( maOldLink ); } short SaneDlg::Execute() @@ -222,7 +222,7 @@ void SaneDlg::InitFields() maReslBox.SetMin( (long)pDouble[0] ); maReslBox.SetMax( (long)pDouble[1] ); maReslBox.InsertValue( (long)pDouble[0] ); - // mh@openoffice.org: issue 68557: Can only select 75 and 2400 dpi in Scanner dialogue + // Can only select 75 and 2400 dpi in Scanner dialogue // scanner allows random setting of dpi resolution, a slider might be useful // support that // workaround: offer at least some more standard dpi resolution between @@ -395,7 +395,7 @@ void SaneDlg::InitFields() { sal_Bool bIsSpecial = sal_False; for( size_t n = 0; !bIsSpecial && - n < sizeof(ppSpecialOptions)/sizeof(ppSpecialOptions[0]); n++ ) + n < SAL_N_ELEMENTS(ppSpecialOptions); n++ ) { if( aOption.EqualsAscii( ppSpecialOptions[n] ) ) bIsSpecial=sal_True; @@ -478,14 +478,12 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton ) { double fRes = (double)maReslBox.GetValue(); SetAdjustedNumericalValue( "resolution", fRes ); - mrSane.SetReloadOptionsHdl( maOldLink ); UpdateScanArea( sal_True ); SaveState(); EndDialog( mrSane.IsOpen() ? 1 : 0 ); } else if( pButton == &maCancelButton ) { - mrSane.SetReloadOptionsHdl( maOldLink ); mrSane.Close(); EndDialog( 0 ); } @@ -688,9 +686,9 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit ) IMPL_LINK( SaneDlg, ReloadSaneOptionsHdl, Sane*, /*pSane*/ ) { - mnCurrentOption = -1; - mnCurrentElement = 0; - DisableOption(); + mnCurrentOption = -1; + mnCurrentElement = 0; + DisableOption(); // #92024# preserve preview rect, should only be set // initially or in AcquirePreview Rectangle aPreviewRect = maPreviewRect; @@ -743,21 +741,23 @@ void SaneDlg::AcquirePreview() maReslBox.SetValue( (sal_uLong)fResl ); if( mbDragEnable ) + { maPreviewRect = Rectangle( maTopLeft, Size( maBottomRight.X() - maTopLeft.X(), maBottomRight.Y() - maTopLeft.Y() ) ); + } else { Size aBMSize( maPreviewBitmap.GetSizePixel() ); - if( aBMSize.Width() > aBMSize.Height() ) + if( aBMSize.Width() > aBMSize.Height() && aBMSize.Width() ) { int nVHeight = (maBottomRight.X() - maTopLeft.X()) * aBMSize.Height() / aBMSize.Width(); maPreviewRect = Rectangle( Point( maTopLeft.X(), ( maTopLeft.Y() + maBottomRight.Y() )/2 - nVHeight/2 ), Size( maBottomRight.X() - maTopLeft.X(), nVHeight ) ); } - else + else if (aBMSize.Height()) { int nVWidth = (maBottomRight.Y() - maTopLeft.Y()) * aBMSize.Width() / aBMSize.Height(); maPreviewRect = Rectangle( Point( ( maTopLeft.X() + maBottomRight.X() )/2 - nVWidth/2, maTopLeft.Y() ), @@ -1168,7 +1168,6 @@ void SaneDlg::UpdateScanArea( sal_Bool bSend ) sal_Bool SaneDlg::LoadState() { -#ifdef USE_SAVE_STATE int i; if( ! Sane::IsSane() ) @@ -1234,14 +1233,10 @@ sal_Bool SaneDlg::LoadState() InitFields(); return sal_True; -#else - return sal_False; -#endif } void SaneDlg::SaveState() { -#ifdef USE_SAVE_STATE if( ! Sane::IsSane() ) return; @@ -1254,59 +1249,6 @@ void SaneDlg::SaveState() aConfig.SetGroup( "SANE" ); aConfig.WriteKey( "SO_LastSANEDevice", ByteString( maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8 ) ); -#ifdef SAVE_ALL_STATES - for( int i = 1; i < mrSane.CountOptions(); i++ ) - { - String aOption=mrSane.GetOptionName( i ); - SANE_Value_Type nType = mrSane.GetOptionType( i ); - switch( nType ) - { - case SANE_TYPE_BOOL: - { - sal_Bool bValue; - if( mrSane.GetOptionValue( i, bValue ) ) - { - ByteString aString( "BOOL=" ); - aString += (sal_uLong)bValue; - aConfig.WriteKey( aOption, aString ); - } - } - break; - case SANE_TYPE_STRING: - { - String aString( "STRING=" ); - String aValue; - if( mrSane.GetOptionValue( i, aValue ) ) - { - aString += aValue; - aConfig.WriteKey( aOption, aString ); - } - } - break; - case SANE_TYPE_FIXED: - case SANE_TYPE_INT: - { - String aString( "NUMERIC=" ); - double fValue; - char buf[256]; - for( int n = 0; n < mrSane.GetOptionElements( i ); n++ ) - { - if( ! mrSane.GetOptionValue( i, fValue, n ) ) - break; - if( n > 0 ) - aString += ":"; - sprintf( buf, "%lg", fValue ); - aString += buf; - } - if( n >= mrSane.GetOptionElements( i ) ) - aConfig.WriteKey( aOption, aString ); - } - break; - default: - break; - } - } -#else static char const* pSaveOptions[] = { "resolution", "tl-x", @@ -1314,9 +1256,7 @@ void SaneDlg::SaveState() "br-x", "br-y" }; - for( size_t i = 0; - i < (sizeof(pSaveOptions)/sizeof(pSaveOptions[0])); - i++ ) + for( size_t i = 0; i < SAL_N_ELEMENTS(pSaveOptions); i++ ) { ByteString aOption = pSaveOptions[i]; int nOption = mrSane.GetOptionByName( pSaveOptions[i] ); @@ -1373,8 +1313,6 @@ void SaneDlg::SaveState() } } } -#endif -#endif } sal_Bool SaneDlg::SetAdjustedNumericalValue( @@ -1429,3 +1367,5 @@ sal_Bool SaneDlg::SetAdjustedNumericalValue( return sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 5fc112732ef8..c3f72eafaebe 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.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. @@ -30,9 +31,7 @@ #include <vcl/dialog.hxx> #include <tools/config.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/field.hxx> @@ -150,3 +149,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index cc08b5f10c52..e833c4f1d56d 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.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. @@ -102,3 +103,5 @@ SEQ( OUString ) ScannerManager::getSupportedServiceNames_Static() throw () return aSNS; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 374c2adc3a25..abe2ae3694c8 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.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. @@ -29,30 +30,24 @@ #define _EXT_SCANNER_HXX #include <tools/stream.hxx> -#include <vos/mutex.hxx> -#ifndef __RTL_USTRING_HXX_ +#include <osl/mutex.hxx> #include <rtl/ustring.hxx> -#endif -#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> -#ifndef __COM_SUN_STAR_AWT_XBITMAP_HPP #include <com/sun/star/awt/XBitmap.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#ifndef __COM_SUN_STAR_LANG_EVENTOBJECT_HPP #include <com/sun/star/lang/EventObject.hpp> -#endif #include <com/sun/star/scanner/XScannerManager.hpp> #include <com/sun/star/scanner/ScannerException.hpp> -using namespace rtl; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::scanner; +using ::rtl::OUString; + // ----------- // - Defines - // ----------- @@ -70,7 +65,7 @@ class ScannerManager : public OWeakObject, XScannerManager, AWT::XBitmap { protected: - vos::OMutex maProtector; + osl::Mutex maProtector; void* mpData; void AcquireData(); @@ -114,3 +109,5 @@ public: REF( XInterface ) SAL_CALL ScannerManager_CreateInstance( const REF( com::sun::star::lang::XMultiServiceFactory )& rxFactory ) throw( Exception ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index 5307ac148487..1f481f668a7e 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.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. @@ -29,8 +30,8 @@ #include "precompiled_extensions.hxx" #include <scanner.hxx> #include <sanedlg.hxx> -#include <vos/thread.hxx> -#include <tools/list.hxx> +#include <osl/thread.hxx> +#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp> #if OSL_DEBUG_LEVEL > 1 @@ -64,7 +65,7 @@ ANY SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti AWT::Size BitmapTransporter::getSize() throw() { - vos::OGuard aGuard( m_aProtector ); + osl::MutexGuard aGuard( m_aProtector ); int nPreviousPos = m_aStream.Tell(); AWT::Size aRet; @@ -88,7 +89,7 @@ AWT::Size BitmapTransporter::getSize() throw() SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw() { - vos::OGuard aGuard( m_aProtector ); + osl::MutexGuard aGuard( m_aProtector ); int nPreviousPos = m_aStream.Tell(); // create return value @@ -111,7 +112,7 @@ struct SaneHolder { Sane m_aSane; REF( AWT::XBitmap ) m_xBitmap; - vos::OMutex m_aProtector; + osl::Mutex m_aProtector; ScanError m_nError; bool m_bBusy; @@ -146,7 +147,7 @@ namespace m_aSanes.clear(); } - struct theSaneProtector : public rtl::Static<vos::OMutex, theSaneProtector> {}; + struct theSaneProtector : public rtl::Static<osl::Mutex, theSaneProtector> {}; struct theSanes : public rtl::Static<allSanes, theSanes> {}; } @@ -154,7 +155,7 @@ namespace // - ScannerThread - // ----------------- -class ScannerThread : public vos::OThread +class ScannerThread : public osl::Thread { boost::shared_ptr<SaneHolder> m_pHolder; REF( com::sun::star::lang::XEventListener ) m_xListener; @@ -192,7 +193,7 @@ ScannerThread::~ScannerThread() void ScannerThread::run() { - vos::OGuard aGuard( m_pHolder->m_aProtector ); + osl::MutexGuard aGuard( m_pHolder->m_aProtector ); BitmapTransporter* pTransporter = new BitmapTransporter; REF( XInterface ) aIf( static_cast< OWeakObject* >( pTransporter ) ); @@ -224,13 +225,13 @@ void ScannerThread::run() void ScannerManager::AcquireData() { - vos::OGuard aGuard( theSaneProtector::get() ); + osl::MutexGuard aGuard( theSaneProtector::get() ); theSanes::get().acquire(); } void ScannerManager::ReleaseData() { - vos::OGuard aGuard( theSaneProtector::get() ); + osl::MutexGuard aGuard( theSaneProtector::get() ); theSanes::get().release(); } @@ -254,7 +255,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw() SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw() { - vos::OGuard aGuard( theSaneProtector::get() ); + osl::MutexGuard aGuard( theSaneProtector::get() ); sanevec &rSanes = theSanes::get().m_aSanes; if( rSanes.empty() ) @@ -267,7 +268,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw() if( Sane::IsSane() ) { SEQ( ScannerContext ) aRet(1); - aRet.getArray()[0].ScannerName = ::rtl::OUString::createFromAscii( "SANE" ); + aRet.getArray()[0].ScannerName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SANE")); aRet.getArray()[0].InternalData = 0; return aRet; } @@ -279,7 +280,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw() sal_Bool ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException ) { - vos::OGuard aGuard( theSaneProtector::get() ); + osl::MutexGuard aGuard( theSaneProtector::get() ); sanevec &rSanes = theSanes::get().m_aSanes; #if OSL_DEBUG_LEVEL > 1 @@ -288,7 +289,7 @@ sal_Bool ScannerManager::configureScanner( ScannerContext& scanner_context ) thr if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner does not exist" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), REF( XScannerManager )( this ), ScanError_InvalidContext ); @@ -296,7 +297,7 @@ sal_Bool ScannerManager::configureScanner( ScannerContext& scanner_context ) thr boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner is busy" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")), REF( XScannerManager )( this ), ScanError_ScanInProgress ); @@ -314,7 +315,7 @@ sal_Bool ScannerManager::configureScanner( ScannerContext& scanner_context ) thr void ScannerManager::startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException ) { - vos::OGuard aGuard( theSaneProtector::get() ); + osl::MutexGuard aGuard( theSaneProtector::get() ); sanevec &rSanes = theSanes::get().m_aSanes; #if OSL_DEBUG_LEVEL > 1 @@ -323,14 +324,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner does not exist" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), REF( XScannerManager )( this ), ScanError_InvalidContext ); boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner is busy" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")), REF( XScannerManager )( this ), ScanError_ScanInProgress ); @@ -344,12 +345,12 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException ) { - vos::OGuard aGuard( theSaneProtector::get() ); + osl::MutexGuard aGuard( theSaneProtector::get() ); sanevec &rSanes = theSanes::get().m_aSanes; if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner does not exist" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), REF( XScannerManager )( this ), ScanError_InvalidContext ); @@ -363,21 +364,23 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException ) { - vos::OGuard aGuard( theSaneProtector::get() ); + osl::MutexGuard aGuard( theSaneProtector::get() ); sanevec &rSanes = theSanes::get().m_aSanes; if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner does not exist" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), REF( XScannerManager )( this ), ScanError_InvalidContext ); boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; - vos::OGuard aProtGuard( pHolder->m_aProtector ); + osl::MutexGuard aProtGuard( pHolder->m_aProtector ); REF( AWT::XBitmap ) xRet( pHolder->m_xBitmap ); pHolder->m_xBitmap = REF( AWT::XBitmap )(); return xRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index e910da58cc8a..963d89287e2d 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.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. @@ -41,8 +42,8 @@ #include <math.h> #include <tools/svwin.h> #include <tools/stream.hxx> -#include <vos/mutex.hxx> -#include <vos/module.hxx> +#include <osl/mutex.hxx> +#include <osl/module.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/sysdata.hxx> @@ -106,7 +107,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener > TW_IDENTITY aSrcIdent; Link aNotifyLink; DSMENTRYPROC pDSM; - vos:: OModule * pMod; + osl::Module* pMod; ULONG nCurState; HWND hTwainWnd; HHOOK hTwainHook; @@ -218,7 +219,7 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) : hTwainWnd = CreateWindowEx( WS_EX_TOPMOST, aWc.lpszClassName, "TWAIN", 0, 0, 0, 0, 0, HWND_DESKTOP, NULL, aWc.hInstance, 0 ); hTwainHook = SetWindowsHookEx( WH_GETMESSAGE, &TwainMsgProc, NULL, GetCurrentThreadId() ); - // #107835# block destruction until ImplDestroyHdl is called + // block destruction until ImplDestroyHdl is called mxSelfRef = static_cast< ::cppu::OWeakObject* >( this ); } @@ -289,7 +290,7 @@ void ImpTwain::ImplOpenSourceManager() { if( 1 == nCurState ) { - pMod = new ::vos::OModule( ::rtl::OUString() ); + pMod = new ::osl::Module( ::rtl::OUString() ); if( pMod->load( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( TWAIN_LIBNAME ) ) ) ) { @@ -343,7 +344,7 @@ bool ImpTwain::ImplEnableSource() aNotifyLink.Call( (void*) TWAIN_EVENT_SCANNING ); nCurState = 5; - // #107835# register as vetoable close listener, to prevent application to die under us + // register as vetoable close listener, to prevent application to die under us ImplRegisterCloseListener(); if( PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_ENABLEDS, &aUI ) == TWRC_SUCCESS ) @@ -354,7 +355,7 @@ bool ImpTwain::ImplEnableSource() { nCurState = 4; - // #107835# deregister as vetoable close listener, dialog failed + // deregister as vetoable close listener, dialog failed ImplDeregisterCloseListener(); } } @@ -502,7 +503,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI ); nCurState = 4; - // #107835# deregister as vetoable close listener + // deregister as vetoable close listener ImplDeregisterCloseListener(); } break; @@ -555,7 +556,7 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ ) if( hTwainHook ) UnhookWindowsHookEx( hTwainHook ); - // #107835# permit destruction of ourselves (normally, refcount + // permit destruction of ourselves (normally, refcount // should drop to zero exactly here) mxSelfRef = NULL; pImpTwainInstance = NULL; @@ -575,7 +576,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() { // query desktop instance uno::Reference< frame::XDesktop > xDesktop( xMgr->createInstance( - OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), uno::UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY ); if( xDesktop.is() ) { @@ -589,12 +590,12 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() try { aActiveFrame = xDesktopProps->getPropertyValue( - OUString::createFromAscii( "ActiveFrame" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveFrame")) ); } catch( const beans::UnknownPropertyException& ) { // property unknown. - DBG_ERROR("ImpTwain::ImplGetActiveFrame: ActiveFrame property unknown, cannot determine active frame!"); + OSL_FAIL("ImpTwain::ImplGetActiveFrame: ActiveFrame property unknown, cannot determine active frame!"); return uno::Reference< frame::XFrame >(); } @@ -613,7 +614,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() { } - DBG_ERROR("ImpTwain::ImplGetActiveFrame: Could not determine active frame!"); + OSL_FAIL("ImpTwain::ImplGetActiveFrame: Could not determine active frame!"); return uno::Reference< frame::XFrame >(); } @@ -629,7 +630,7 @@ uno::Reference< util::XCloseBroadcaster > ImpTwain::ImplGetActiveFrameCloseBroad { } - DBG_ERROR("ImpTwain::ImplGetActiveFrameCloseBroadcaster: Could determine close broadcaster on active frame!"); + OSL_FAIL("ImpTwain::ImplGetActiveFrameCloseBroadcaster: Could determine close broadcaster on active frame!"); return uno::Reference< util::XCloseBroadcaster >(); } @@ -649,7 +650,7 @@ void ImpTwain::ImplRegisterCloseListener() else { // interface unknown. don't register, then - DBG_ERROR("ImpTwain::ImplRegisterCloseListener: XFrame has no XCloseBroadcaster!"); + OSL_FAIL("ImpTwain::ImplRegisterCloseListener: XFrame has no XCloseBroadcaster!"); return; } } @@ -657,7 +658,7 @@ void ImpTwain::ImplRegisterCloseListener() { } - DBG_ERROR("ImpTwain::ImplRegisterCloseListener: Could not register as close listener!"); + OSL_FAIL("ImpTwain::ImplRegisterCloseListener: Could not register as close listener!"); } // ----------------------------------------------------------------------------- @@ -677,7 +678,7 @@ void ImpTwain::ImplDeregisterCloseListener() else { // interface unknown. don't deregister, then - DBG_ERROR("ImpTwain::ImplDeregisterCloseListener: XFrame has no XCloseBroadcaster!"); + OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: XFrame has no XCloseBroadcaster!"); return; } } @@ -685,7 +686,7 @@ void ImpTwain::ImplDeregisterCloseListener() { } - DBG_ERROR("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!"); + OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!"); } // ----------------------------------------------------------------------------- @@ -704,7 +705,7 @@ void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_B void SAL_CALL ImpTwain::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) { // should not happen - DBG_ERROR("ImpTwain::notifyClosing called, but we vetoed the closing before!"); + OSL_FAIL("ImpTwain::notifyClosing called, but we vetoed the closing before!"); } // ----------------------------------------------------------------------------- @@ -729,7 +730,7 @@ void ImpTwain::ImplSendCloseEvent() { } - DBG_ERROR("ImpTwain::ImplSendCloseEvent: Could not send required close broadcast!"); + OSL_FAIL("ImpTwain::ImplSendCloseEvent: Could not send required close broadcast!"); } @@ -783,7 +784,7 @@ bool Twain::SelectSource( ScannerManager& rMgr ) if( !mpImpTwain ) { - // #107835# hold reference to ScannerManager, to prevent premature death + // hold reference to ScannerManager, to prevent premature death mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ), uno::UNO_QUERY ), @@ -805,7 +806,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X if( !mpImpTwain ) { - // #107835# hold reference to ScannerManager, to prevent premature death + // hold reference to ScannerManager, to prevent premature death mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ), uno::UNO_QUERY ), @@ -990,7 +991,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw() SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw() { - vos::OGuard aGuard( maProtector ); + osl::MutexGuard aGuard( maProtector ); SEQ( ScannerContext ) aRet( 1 ); aRet.getArray()[0].ScannerName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ); @@ -1004,7 +1005,7 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw() sal_Bool SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext ) throw( ScannerException ) { - vos::OGuard aGuard( maProtector ); + osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) ) @@ -1020,7 +1021,7 @@ sal_Bool SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext ) void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener ) throw( ScannerException ) { - vos::OGuard aGuard( maProtector ); + osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) ) @@ -1035,7 +1036,7 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) throw( ScannerException ) { - vos::OGuard aGuard( maProtector ); + osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) ) @@ -1049,6 +1050,8 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ ) throw( ScannerException ) { - vos::OGuard aGuard( maProtector ); + osl::MutexGuard aGuard( maProtector ); return uno::Reference< awt::XBitmap >( this ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index e96522002b9a..6f18a8ed607e 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.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. @@ -71,3 +72,5 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* return pRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx index bd17f1e56117..1bbc9128af3d 100644 --- a/extensions/source/scanner/twain.cxx +++ b/extensions/source/scanner/twain.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. @@ -37,7 +38,7 @@ #ifdef OS2 #include <svpm.h> #endif // OS2 -#include <vos/module.hxx> +#include <osl/module.hxx> #include <tools/stream.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -239,7 +240,7 @@ void ImpTwain::ImplOpenSourceManager() { if( 1 == nCurState ) { - pMod = new vos:: OModule (); + pMod = new osl::Module(); if( pMod->load( TWAIN_LIBNAME ) ) { @@ -527,3 +528,5 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, p ) return 0L; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx index bb9fa44b6cf6..95d6c5871bd9 100644 --- a/extensions/source/scanner/twain.hxx +++ b/extensions/source/scanner/twain.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. @@ -28,7 +29,7 @@ #ifndef _TWAIN_HXX #define _TWAIN_HXX -#include <vos/module.hxx> +#include <osl/module.hxx> #include <vcl/bitmap.hxx> #include "twain/twain.h" @@ -57,7 +58,7 @@ class ImpTwain Link aNotifyLink; Bitmap aBitmap; DSMENTRYPROC pDSM; - vos:: OModule * pMod; + osl::Module pMod; sal_uLong nCurState; void ImplCreate(); @@ -96,3 +97,5 @@ public: }; #endif // _TWAIN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx index fbe5badb17e6..324fefa16b6f 100644 --- a/extensions/source/svg/svgaction.cxx +++ b/extensions/source/svg/svgaction.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. @@ -518,7 +519,7 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, const if( pLineColor ) { // !!! mrExport.AddAttribute( XML_NAMESPACE_NONE, ... ) - DBG_ERROR( "SVGActionWriter::ImplWriteLine: Line color not implemented" ); + OSL_FAIL( "SVGActionWriter::ImplWriteLine: Line color not implemented" ); } { @@ -841,19 +842,19 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, { String aTransform; - aTransform = NMSP_RTL::OUString::createFromAscii( "translate" ); + aTransform = NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM("translate")); aTransform += '('; aTransform += String( GetValueString( aPt.X(), mbDoublePoints ) ); aTransform += ','; aTransform += String( GetValueString( aPt.Y(), mbDoublePoints ) ); aTransform += ')'; - aTransform += String( NMSP_RTL::OUString::createFromAscii( " rotate" ) ); + aTransform += String( NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(" rotate")) ); aTransform += '('; aTransform += String( NMSP_RTL::OUString::valueOf( rFont.GetOrientation() * -0.1 ) ); aTransform += ')'; - aTransform += String( NMSP_RTL::OUString::createFromAscii( " translate" ) ); + aTransform += String( NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(" translate")) ); aTransform += '('; aTransform += String( GetValueString( -aPt.X(), mbDoublePoints ) ); aTransform += ','; @@ -1448,7 +1449,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL: default : ByteString aDbgOut( "SVGActionWriter::ImplWriteActions: unsupported MetaAction #" ); aDbgOut.Append( ByteString::CreateFromInt32( nType ) ); - DBG_ERROR( aDbgOut.GetBuffer() ); + OSL_FAIL( aDbgOut.GetBuffer() ); break; #endif } @@ -1456,3 +1457,5 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL: ImplReleaseContext(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/svg/svgaction.hxx b/extensions/source/svg/svgaction.hxx index b73fba3e95c5..309d20aec6b4 100644 --- a/extensions/source/svg/svgaction.hxx +++ b/extensions/source/svg/svgaction.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. @@ -162,3 +163,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/svg/svgcom.hxx b/extensions/source/svg/svgcom.hxx index 3e593ff3ccf6..b43beeb611e9 100644 --- a/extensions/source/svg/svgcom.hxx +++ b/extensions/source/svg/svgcom.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. @@ -29,28 +30,19 @@ #define _SVGCOM_HXX #include <cppuhelper/weak.hxx> -#ifndef __RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> #include <tools/urlobj.hxx> #include <tools/stack.hxx> -#ifndef _SALBTYPE_HXX #include <vcl/salbtype.hxx> -#endif -#ifndef _GDIMTF_HXX #include <vcl/gdimtf.hxx> -#endif -#ifndef _METAACT_HXX #include <vcl/metaact.hxx> -#endif #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -80,3 +72,5 @@ #define SVG_DTD_STRING B2UCONST( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" ) #endif // _SYNCCOM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/svg/svgprinter.cxx b/extensions/source/svg/svgprinter.cxx index 24a6244d0b79..288f5bac5d22 100644 --- a/extensions/source/svg/svgprinter.cxx +++ b/extensions/source/svg/svgprinter.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. @@ -326,3 +327,5 @@ void SAL_CALL SVGPrinter::endJob() throw( NMSP_UNO::RuntimeException ) { delete mpWriter, mpWriter = NULL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/svg/svgprinter.hxx b/extensions/source/svg/svgprinter.hxx index 743a86bc7a50..bbc29a06b6f8 100644 --- a/extensions/source/svg/svgprinter.hxx +++ b/extensions/source/svg/svgprinter.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. @@ -65,3 +66,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/svg/svguno.cxx b/extensions/source/svg/svguno.cxx index 5e4281ca2e28..7fb81d407452 100644 --- a/extensions/source/svg/svguno.cxx +++ b/extensions/source/svg/svguno.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. @@ -96,3 +97,5 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* return pRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/svg/svgwriter.cxx b/extensions/source/svg/svgwriter.cxx index 341891cc9003..e89c69e4b4e1 100644 --- a/extensions/source/svg/svgwriter.cxx +++ b/extensions/source/svg/svgwriter.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. @@ -53,7 +54,6 @@ protected: public: - // #110680# SVGMtfExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const REF( NMSP_SAX::XDocumentHandler )& rxHandler ); @@ -65,7 +65,6 @@ public: // ----------------------------------------------------------------------------- -// #110680# SVGMtfExport::SVGMtfExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const REF( NMSP_SAX::XDocumentHandler )& rxHandler ) @@ -166,10 +165,10 @@ void SAL_CALL SVGWriter::write( const REF( NMSP_SAX::XDocumentHandler )& rxDocHa const REF( NMSP_SAX::XDocumentHandler ) xDocumentHandler( rxDocHandler ); - // #110680# - // SVGMtfExport* pWriter = new SVGMtfExport( xDocumentHandler ); SVGMtfExport* pWriter = new SVGMtfExport( mxFact, xDocumentHandler ); pWriter->writeMtf( aMtf ); delete pWriter; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/svg/svgwriter.hxx b/extensions/source/svg/svgwriter.hxx index dc1ea932ebe3..2622f83f0182 100644 --- a/extensions/source/svg/svgwriter.hxx +++ b/extensions/source/svg/svgwriter.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. @@ -58,3 +59,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/unoactivex/main/initwindowpeer.cxx b/extensions/source/unoactivex/main/initwindowpeer.cxx index cbdc9146fd0d..5e88b5b489dd 100644 --- a/extensions/source/unoactivex/main/initwindowpeer.cxx +++ b/extensions/source/unoactivex/main/initwindowpeer.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. @@ -85,3 +86,4 @@ void SAL_CALL InitWindowPeer::removeEventListener( const uno::Reference< lang::X { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/actionlistener.hxx b/extensions/source/update/check/actionlistener.hxx index 6d90357aef85..a1c4571900bf 100644 --- a/extensions/source/update/check/actionlistener.hxx +++ b/extensions/source/update/check/actionlistener.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. @@ -44,3 +45,4 @@ class IActionListener : public rtl::IReference #endif //INCLUDED_ACTION_LISTENER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 09d90f1eaa83..68123924c567 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.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. @@ -458,3 +459,5 @@ Download::stop() { m_aCondition.set(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/download.hxx b/extensions/source/update/check/download.hxx index ff16ef52f7fb..00106660b4af 100644 --- a/extensions/source/update/check/download.hxx +++ b/extensions/source/update/check/download.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. @@ -82,3 +83,4 @@ private: }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 8419569bd949..1e0366f6de11 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.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. @@ -42,14 +43,13 @@ #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -// #include <comphelper/processfactory.hxx> - #include <rtl/ustrbuf.hxx> #include <rtl/bootstrap.hxx> #include <osl/process.h> #include <osl/module.hxx> #include <osl/file.hxx> +#include <sal/macros.h> #ifdef WNT #ifdef _MSC_VER @@ -578,7 +578,7 @@ UpdateCheckThread::run() // Increase next by 15, 60, .. minutes static const sal_Int32 nRetryInterval[] = { 900, 3600, 14400, 86400 }; - if( n < sizeof(nRetryInterval) / sizeof(sal_Int32) ) + if( n < SAL_N_ELEMENTS(nRetryInterval) ) ++n; tv.Seconds = nRetryInterval[n-1]; @@ -690,7 +690,7 @@ DownloadThread::run() // Increase next by 1, 5, 15, 60, .. minutes static const sal_Int16 nRetryInterval[] = { 60, 300, 900, 3600 }; - if( n < sizeof(nRetryInterval) / sizeof(sal_Int16) ) + if( n < SAL_N_ELEMENTS(nRetryInterval) ) ++n; tv.Seconds = nRetryInterval[n-1]; @@ -1544,7 +1544,7 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const rtl::OUString &rURL) return true; osl::File aFile( aFilePath ); - rc = aFile.open( OpenFlag_Write | OpenFlag_Create ); + rc = aFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); if ( rc != osl::FileBase::E_None ) return false; @@ -1688,3 +1688,5 @@ UpdateCheck::release() SAL_THROW(()) { return ReferenceObject::release(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx index 7283288769e0..0f0768919877 100644 --- a/extensions/source/update/check/updatecheck.hxx +++ b/extensions/source/update/check/updatecheck.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. @@ -192,3 +193,5 @@ UpdateCheckInitData::operator() () const { return rtl::Reference< UpdateCheck > (new UpdateCheck()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index cca69db6ff33..2b3d6a79cf86 100755..100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.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. @@ -34,10 +35,10 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> - #include <osl/security.hxx> #include <osl/time.h> #include <osl/file.hxx> +#include <sal/macros.h> #ifdef WNT #ifdef _MSC_VER @@ -92,7 +93,7 @@ static const sal_Char * const aUpdateEntryProperties[] = { OLD_VERSION }; -static const sal_uInt32 nUpdateEntryProperties = sizeof(aUpdateEntryProperties) / sizeof(sal_Char *); +static const sal_uInt32 nUpdateEntryProperties = SAL_N_ELEMENTS(aUpdateEntryProperties); //------------------------------------------------------------------------------ @@ -212,7 +213,7 @@ rtl::OUString UpdateCheckConfig::getDesktopDirectory() // This should become a desktop specific setting in some system backend .. rtl::OUString aHomeDir; osl::Security().getHomeDir( aHomeDir ); - aRet = aHomeDir + rtl::OUString::createFromAscii("/Desktop"); + aRet = aHomeDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Desktop")); // Set path to home directory when there is no /Desktop directory osl::Directory aDocumentsDir( aRet ); @@ -808,3 +809,4 @@ UpdateCheckConfig::getSupportedServiceNames() throw (uno::RuntimeException) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index cf55a0787488..255b717c0372 100755 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.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. @@ -240,3 +241,5 @@ T getValue( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Name return T(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatecheckconfiglistener.hxx b/extensions/source/update/check/updatecheckconfiglistener.hxx index 9d2c406b455a..fc7ee7926252 100644 --- a/extensions/source/update/check/updatecheckconfiglistener.hxx +++ b/extensions/source/update/check/updatecheckconfiglistener.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. @@ -41,3 +42,5 @@ struct UpdateCheckConfigListener : public rtl::IReference }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 9a87779e0999..f6ffb0e821a7 100755 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.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. @@ -200,14 +201,14 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) { for ( sal_Int32 n=namedValues.getLength(); n-- > 0; ) { - if ( namedValues[ n ].Name.equalsAscii( "DynamicData" ) ) + if ( namedValues[ n ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DynamicData" ) ) ) { uno::Sequence<beans::NamedValue> aListProp; if ( namedValues[n].Value >>= aListProp ) { for ( sal_Int32 i=aListProp.getLength(); i-- > 0; ) { - if ( aListProp[ i ].Name.equalsAscii( "updateList" ) ) + if ( aListProp[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "updateList" ) ) ) { handleExtensionUpdates( aListProp ); return uno::Any(); @@ -232,7 +233,7 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) m_pInitThread.reset( new InitUpdateCheckJobThread( m_xContext, aConfig, - !aEventName.equalsAscii("onFirstVisibleTask"))); + !aEventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("onFirstVisibleTask")))); return uno::Any(); } @@ -397,3 +398,5 @@ component_getFactory(const sal_Char *pszImplementationName, void *pServiceManage pRegistryKey, kImplementations_entries) ; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index ab6260bd804b..b25854fc64a1 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.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. @@ -379,7 +380,7 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent ) case HELP_BUTTON: break; default: - OSL_ENSURE( false, "UpdateHandler::actionPerformed: unknown command!" ); + OSL_FAIL( "UpdateHandler::actionPerformed: unknown command!" ); } } @@ -649,7 +650,7 @@ rtl::OUString UpdateHandler::loadString( const uno::Reference< resource::XResour } catch( const uno::Exception& ) { - OSL_ENSURE( false, "UpdateHandler::loadString: caught an exception!" ); + OSL_FAIL( "UpdateHandler::loadString: caught an exception!" ); sString = UNISTRING("Missing ") + sKey; } @@ -685,7 +686,7 @@ void UpdateHandler::loadStrings() } catch( const uno::Exception& ) { - OSL_ENSURE( false, "UpdateHandler::loadStrings: could not create the resource loader!" ); + OSL_FAIL( "UpdateHandler::loadStrings: could not create the resource loader!" ); } if ( !xLoader.is() ) return; @@ -698,7 +699,7 @@ void UpdateHandler::loadStrings() } catch( const resource::MissingResourceException& ) { - OSL_ENSURE( false, "UpdateHandler::loadStrings: missing the resource bundle!" ); + OSL_FAIL( "UpdateHandler::loadStrings: missing the resource bundle!" ); } if ( !xBundle.is() ) return; @@ -791,7 +792,7 @@ void UpdateHandler::setControlProperty( const rtl::OUString &rCtrlName, } catch( const beans::UnknownPropertyException& ) { - OSL_ENSURE( false, "UpdateHandler::setControlProperty: caught an exception!" ); + OSL_FAIL( "UpdateHandler::setControlProperty: caught an exception!" ); } } @@ -802,7 +803,7 @@ void UpdateHandler::showControl( const rtl::OUString &rCtrlName, bool bShow ) if ( !xContainer.is() ) { - OSL_ENSURE( false, "UpdateHandler::showControl: could not get control container!" ); + OSL_FAIL( "UpdateHandler::showControl: could not get control container!" ); return; } @@ -818,7 +819,7 @@ void UpdateHandler::focusControl( DialogControls eID ) if ( !xContainer.is() ) { - OSL_ENSURE( false, "UpdateHandler::focusControl: could not get control container!" ); + OSL_FAIL( "UpdateHandler::focusControl: could not get control container!" ); return; } @@ -1418,3 +1419,5 @@ void UpdateHandler::createDialog() mxUpdDlg.set( xControl, uno::UNO_QUERY_THROW ); mnLastCtrlState = -1; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index bd525853dda1..6a6336530747 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.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. @@ -31,9 +32,7 @@ #include "boost/utility.hpp" #include <osl/mutex.hxx> #include "com/sun/star/uno/Any.h" -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include "com/sun/star/uno/Reference.h" -#endif #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/awt/Rectangle.hpp" #include "com/sun/star/awt/XActionListener.hpp" @@ -219,3 +218,5 @@ public: }; #endif /* INCLUDED_UPDATE_HDL_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updateinfo.hxx b/extensions/source/update/check/updateinfo.hxx index 3249a59ad7d0..56ecf2ecfd69 100644 --- a/extensions/source/update/check/updateinfo.hxx +++ b/extensions/source/update/check/updateinfo.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. @@ -84,3 +85,5 @@ UpdateInfo & UpdateInfo::operator=( const UpdateInfo& ui ) rtl::OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled=false); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index fa460ace702c..5a59b4e070fe 100755 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.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. @@ -32,9 +33,7 @@ #include "updateprotocol.hxx" #include "updatecheckconfig.hxx" -#ifndef _COM_SUN_STAR_DEPLOYMENT_UPDATEINFORMATINENTRY_HPP_ #include <com/sun/star/deployment/UpdateInformationEntry.hpp> -#endif #include <com/sun/star/deployment/XPackageInformationProvider.hpp> @@ -285,7 +284,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & } catch( const uno::Exception& ) { - OSL_ENSURE( false, "checkForExtensionUpdates: could not create the PackageInformationProvider!" ); + OSL_FAIL( "checkForExtensionUpdates: could not create the PackageInformationProvider!" ); } if ( !xInfoProvider.is() ) return false; @@ -311,7 +310,7 @@ bool checkForPendingUpdates( const uno::Reference< uno::XComponentContext > & rx } catch( const uno::Exception& ) { - OSL_ENSURE( false, "checkForExtensionUpdates: could not create the PackageInformationProvider!" ); + OSL_FAIL( "checkForExtensionUpdates: could not create the PackageInformationProvider!" ); } if ( !xInfoProvider.is() ) return false; @@ -333,3 +332,5 @@ bool checkForPendingUpdates( const uno::Reference< uno::XComponentContext > & rx return bPendingUpdateFound; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx index d99ae9e7af2d..ef7d150867b0 100644 --- a/extensions/source/update/check/updateprotocol.hxx +++ b/extensions/source/update/check/updateprotocol.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. @@ -54,3 +55,4 @@ bool storeExtensionUpdateInfos( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< rtl::OUString > > &rUpdateInfos ); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx index 70623cea6224..bbcd225019c6 100644 --- a/extensions/source/update/check/updateprotocoltest.cxx +++ b/extensions/source/update/check/updateprotocoltest.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. @@ -92,3 +93,5 @@ SAL_IMPLEMENT_MAIN() return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index 025a16dbcd76..a9bd65bc32d1 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.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. @@ -104,3 +105,5 @@ SAL_IMPLEMENT_MAIN() return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 12af008ee853..7105c72cea95 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.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. @@ -861,3 +862,4 @@ component_getFactory(const sal_Char *pszImplementationName, void *pServiceManage kImplementations_entries) ; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/tools/makefile.mk b/extensions/source/update/tools/makefile.mk index c8c41532662e..110887bb102f 100644 --- a/extensions/source/update/tools/makefile.mk +++ b/extensions/source/update/tools/makefile.mk @@ -41,28 +41,4 @@ APP1TARGET = ztool APP1OBJS = $(OBJ)$/ztool.obj APP1STDLIBS = $(TOOLSLIB) -#APP1TARGET = ztool -#APP1OBJS = $(OBJ)$/ztool.obj -#.IF "$(GUI)" == "UNX" -#APP1STDLIBS = $(TOOLSLIB) -#.ELSE -#APP1LIBS = $(LB)$/itools.lib -#.ENDIF - -#APP2TARGET = urltest -#APP2OBJS = $(OBJ)$/urltest.obj -#.IF "$(GUI)" == "UNX" -#APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) -#.ELSE -#APP2STDLIBS = $(LB)$/itools.lib ivos.lib isal.lib icppu.lib icppuhelper.lib -#.ENDIF - -# APP3TARGET = tldem -# APP3OBJS = $(OBJ)$/tldem.obj -# .IF "$(GUI)" == "UNX" -# APP3STDLIBS = $(TOOLSLIB) -# .ELSE -# APP3STDLIBS = $(LB)$/itools.lib -# .ENDIF - .INCLUDE: target.mk diff --git a/extensions/source/update/tools/ztool.cxx b/extensions/source/update/tools/ztool.cxx index 6bb38c65d59a..fbcf02e66a65 100644 --- a/extensions/source/update/tools/ztool.cxx +++ b/extensions/source/update/tools/ztool.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. @@ -61,3 +62,5 @@ main( int argc, char **argv ) } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index b0b5f684bcc0..dbb220acae70 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.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. @@ -42,7 +43,6 @@ #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> #include <osl/mutex.hxx> #include <vcl/window.hxx> @@ -310,17 +310,10 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) if ( pMBarWin ) nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight(); - if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { - if ( nMBarHeight >= 35 ) - nResID = RID_UPDATE_AVAILABLE_26_HC; - else - nResID = RID_UPDATE_AVAILABLE_16_HC; - } else { - if ( nMBarHeight >= 35 ) - nResID = RID_UPDATE_AVAILABLE_26; - else - nResID = RID_UPDATE_AVAILABLE_16; - } + if ( nMBarHeight >= 35 ) + nResID = RID_UPDATE_AVAILABLE_26; + else + nResID = RID_UPDATE_AVAILABLE_16; return Image( ResId( nResID, *mpUpdResMgr ) ); } @@ -343,12 +336,12 @@ Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL ) { uno::Reference< graphic::XGraphicProvider > xGraphProvider( xServiceManager->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ), uno::UNO_QUERY ); if ( xGraphProvider.is() ) { uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "URL" ); + aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); aMediaProps[0].Value <<= rURL; uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps ); @@ -375,7 +368,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) if ( ! mbShowMenuIcon ) return; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; MenuBar *pActiveMBar = pSysWin->GetMenuBar(); if ( ( pSysWin != mpIconSysWin ) || ( pActiveMBar != mpIconMBar ) ) @@ -427,7 +420,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) void SAL_CALL UpdateCheckUI::notifyEvent(const document::EventObject& rEvent) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( rEvent.EventName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("OnPrepareViewClosing") ) == 0 ) { @@ -454,7 +447,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName, throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; rtl::OUString aString; @@ -518,7 +511,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName, uno::Any UpdateCheckUI::getPropertyValue(const rtl::OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Any aRet; @@ -611,7 +604,7 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow() //------------------------------------------------------------------------------ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; maWaitTimer.Stop(); maTimeoutTimer.Stop(); @@ -644,7 +637,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) // ----------------------------------------------------------------------- IMPL_LINK( UpdateCheckUI, ClickHdl, sal_uInt16*, EMPTYARG ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; maWaitTimer.Stop(); if ( mpBubbleWin ) @@ -678,7 +671,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pDat // ----------------------------------------------------------------------- IMPL_LINK( UpdateCheckUI, WaitTimeOutHdl, Timer*, EMPTYARG ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; mpBubbleWin = GetBubbleWindow(); @@ -701,7 +694,7 @@ IMPL_LINK( UpdateCheckUI, TimeOutHdl, Timer*, EMPTYARG ) // ----------------------------------------------------------------------- IMPL_LINK( UpdateCheckUI, UserEventHdl, UpdateCheckUI*, EMPTYARG ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window *pTopWin = Application::GetFirstTopLevelWindow(); Window *pActiveWin = Application::GetActiveTopWindow(); @@ -738,7 +731,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) if ( VCLEVENT_OBJECT_DYING == nEventID ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( mpIconSysWin == pEvent->GetWindow() ) { mpIconSysWin->RemoveEventListener( maWindowEventHdl ); @@ -747,7 +740,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) } else if ( VCLEVENT_WINDOW_MENUBARADDED == nEventID ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window *pWindow = pEvent->GetWindow(); if ( pWindow ) { @@ -760,7 +753,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) } else if ( VCLEVENT_WINDOW_MENUBARREMOVED == nEventID ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; MenuBar *pMBar = (MenuBar*) pEvent->GetData(); if ( pMBar && ( pMBar == mpIconMBar ) ) RemoveBubbleWindow( true ); @@ -768,7 +761,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) else if ( ( nEventID == VCLEVENT_WINDOW_MOVE ) || ( nEventID == VCLEVENT_WINDOW_RESIZE ) ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( ( mpIconSysWin == pEvent->GetWindow() ) && ( mpBubbleWin != NULL ) && ( mpIconMBar != NULL ) ) { @@ -791,7 +784,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) case VCLEVENT_WINDOW_SHOW: case VCLEVENT_WINDOW_ACTIVATE: case VCLEVENT_WINDOW_GETFOCUS: { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window *pWindow = static_cast< VclWindowEvent * >(pEvent)->GetWindow(); if ( pWindow && pWindow->IsTopWindow() ) @@ -844,7 +837,7 @@ BubbleWindow::~BubbleWindow() //------------------------------------------------------------------------------ void BubbleWindow::Resize() { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; FloatingWindow::Resize(); @@ -887,7 +880,7 @@ void BubbleWindow::SetTitleAndText( const XubString& rTitle, //------------------------------------------------------------------------------ void BubbleWindow::Paint( const Rectangle& ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; LineInfo aThickLine( LINE_SOLID, 2 ); @@ -933,7 +926,7 @@ void BubbleWindow::MouseButtonDown( const MouseEvent& ) //------------------------------------------------------------------------------ void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !bVisible ) { @@ -1069,3 +1062,4 @@ component_getFactory(const sal_Char *pszImplementationName, void *pServiceManage kImplementations_entries) ; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/ui/updatecheckui.hrc b/extensions/source/update/ui/updatecheckui.hrc index 3d92e4579f58..636cff231ada 100644 --- a/extensions/source/update/ui/updatecheckui.hrc +++ b/extensions/source/update/ui/updatecheckui.hrc @@ -31,6 +31,4 @@ #define RID_UPDATE_AVAILABLE_16 RID_UPDATECHECKUI_START + 1 #define RID_UPDATE_AVAILABLE_26 RID_UPDATECHECKUI_START + 2 - #define RID_UPDATE_AVAILABLE_16_HC RID_UPDATECHECKUI_START + 3 - #define RID_UPDATE_AVAILABLE_26_HC RID_UPDATECHECKUI_START + 4 diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src index 39b6f44dce4d..084b2f82149d 100644 --- a/extensions/source/update/ui/updatecheckui.src +++ b/extensions/source/update/ui/updatecheckui.src @@ -39,13 +39,3 @@ ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; }; STD_MASK_COLOR }; - Image RID_UPDATE_AVAILABLE_16_HC - { - ImageBitmap = Bitmap{ file = "onlineupdate_16_h.png"; }; - STD_MASK_COLOR - }; - Image RID_UPDATE_AVAILABLE_26_HC - { - ImageBitmap = Bitmap{ file = "onlineupdate_26_h.png"; }; - STD_MASK_COLOR - }; diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx index d5131b4556bf..fd8690f26b32 100644 --- a/extensions/source/xmlextract/xmxcom.hxx +++ b/extensions/source/xmlextract/xmxcom.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. @@ -29,9 +30,7 @@ #define _XMXCOM_HXX #include <cppuhelper/weak.hxx> -#ifndef __RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> @@ -41,7 +40,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -63,3 +61,5 @@ #define B2UCONST( _def_pChar ) (NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar ))) #endif // _XMXCOM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/xmlextract/xmxtrct.cxx b/extensions/source/xmlextract/xmxtrct.cxx index 8ffa0530700d..f49be79a6d84 100644 --- a/extensions/source/xmlextract/xmxtrct.cxx +++ b/extensions/source/xmlextract/xmxtrct.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. @@ -195,3 +196,5 @@ REF( NMSP_IO::XInputStream ) SAL_CALL XMLExtractor::extract( const REF( NMSP_IO: return xRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/xmlextract/xmxtrct.hxx b/extensions/source/xmlextract/xmxtrct.hxx index 2734c45ecae5..264609b8d6a7 100644 --- a/extensions/source/xmlextract/xmxtrct.hxx +++ b/extensions/source/xmlextract/xmxtrct.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. @@ -52,3 +53,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/xmlextract/xmxuno.cxx b/extensions/source/xmlextract/xmxuno.cxx index 98d11238fb73..81bd158e2f93 100644 --- a/extensions/source/xmlextract/xmxuno.cxx +++ b/extensions/source/xmlextract/xmxuno.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. @@ -77,3 +78,5 @@ void * SAL_CALL component_getFactory( return pRet; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp index 343b206d0085..283cffd5f0bc 100644 --- a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp +++ b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp @@ -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,9 +34,7 @@ #include "stdafx.h" #include "resource.h" #include <initguid.h> -//#include "AxTestComponents.h" -//#include "AxTestComponents_i.c" #include "Basic.h" #include "Foo.h" @@ -97,4 +96,6 @@ STDAPI DllUnregisterServer(void) } -//VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED
\ No newline at end of file +//VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/AxTestComponents/Basic.cpp b/extensions/test/ole/AxTestComponents/Basic.cpp index d48bc5fe59ca..4fa950922801 100644 --- a/extensions/test/ole/AxTestComponents/Basic.cpp +++ b/extensions/test/ole/AxTestComponents/Basic.cpp @@ -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. @@ -24,12 +25,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #include "stdafx.h" -//#include "AxTestComponents.h" #include "Basic.h" - ///////////////////////////////////////////////////////////////////////////// // CBasic CBasic::CBasic(): m_cPrpByte(0),m_nPrpShort(0),m_lPrpLong(0),m_fPrpFloat(0), m_dPrpDouble(0),m_PrpArray(0), @@ -1362,3 +1362,5 @@ STDMETHODIMP CBasic::put_prpUnknown(IUnknown* newVal) m_prpUnknown = newVal; return S_OK; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/AxTestComponents/Basic.h b/extensions/test/ole/AxTestComponents/Basic.h index 0a12b709e33e..08d63062f13b 100644 --- a/extensions/test/ole/AxTestComponents/Basic.h +++ b/extensions/test/ole/AxTestComponents/Basic.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. @@ -30,9 +31,8 @@ #define __BASIC_H_ #include "resource.h" // main symbols -//#include "AxTestComponents.h" #import "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids -//#include "AxTestComponents.h" + ///////////////////////////////////////////////////////////////////////////// // CBasic class ATL_NO_VTABLE CBasic : @@ -267,3 +267,4 @@ public: #endif //__BASIC_H_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/AxTestComponents/Foo.cpp b/extensions/test/ole/AxTestComponents/Foo.cpp index 256b900945a2..6d6ae3b7a0bd 100644 --- a/extensions/test/ole/AxTestComponents/Foo.cpp +++ b/extensions/test/ole/AxTestComponents/Foo.cpp @@ -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. @@ -24,12 +25,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #include "stdafx.h" -//#include "AxTestComponents.h" #include "Foo.h" - ///////////////////////////////////////////////////////////////////////////// // CBasic CFoo::CFoo() @@ -45,3 +45,5 @@ STDMETHODIMP CFoo::Foo(IUnknown *pVal) { return S_OK; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/AxTestComponents/Foo.h b/extensions/test/ole/AxTestComponents/Foo.h index 6c6625c43a30..375d09878fa9 100644 --- a/extensions/test/ole/AxTestComponents/Foo.h +++ b/extensions/test/ole/AxTestComponents/Foo.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. @@ -30,9 +31,8 @@ #define __Foo_H_ #include "resource.h" // main symbols -//#include "AxTestComponents.h" #import "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids -//#include "AxTestComponents.h" + ///////////////////////////////////////////////////////////////////////////// // CBasic class ATL_NO_VTABLE CFoo : @@ -63,3 +63,4 @@ public: #endif //__BASIC_H_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/AxTestComponents/StdAfx.cpp b/extensions/test/ole/AxTestComponents/StdAfx.cpp index 97fda64fc540..36dc86fc2eba 100644 --- a/extensions/test/ole/AxTestComponents/StdAfx.cpp +++ b/extensions/test/ole/AxTestComponents/StdAfx.cpp @@ -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. @@ -29,7 +30,6 @@ #ifdef _ATL_STATIC_REGISTRY #include <statreg.h> -//#include <statreg.cpp> #endif -//#include <atlimpl.cpp> +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/AxTestComponents/StdAfx.h b/extensions/test/ole/AxTestComponents/StdAfx.h index bcd957568818..ab7782f42659 100644 --- a/extensions/test/ole/AxTestComponents/StdAfx.h +++ b/extensions/test/ole/AxTestComponents/StdAfx.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. @@ -54,3 +55,5 @@ extern CComModule _Module; // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_STDAFX_H__BFE10EB4_8584_11D4_8335_005004526AB4__INCLUDED) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/AxTestComponents/resource.h b/extensions/test/ole/AxTestComponents/resource.h index a8bc1785e9ba..a3c9b0c20f46 100644 --- a/extensions/test/ole/AxTestComponents/resource.h +++ b/extensions/test/ole/AxTestComponents/resource.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. @@ -42,3 +43,5 @@ #define _APS_NEXT_SYMED_VALUE 102 #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp index 02dc541c1bc2..768f9ec29b68 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // EventListener.cpp : Implementation of DLL Exports. @@ -70,3 +71,4 @@ STDAPI DllUnregisterServer(void) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp index 9a469cbfcfc1..1605b098240d 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp +++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // EvtListener.cpp : Implementierung von CEvtListener #include "stdafx.h" #include "EventListener.h" @@ -16,4 +17,5 @@ STDMETHODIMP CEvtListener::disposing( IDispatch* source) CEvtListener::~CEvtListener() { -}
\ No newline at end of file +} +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h index 7b9b6a1f8df7..24552b9a9641 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h +++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // EvtListener.h : Deklaration von CEvtListener #ifndef __EVTLISTENER_H_ @@ -33,3 +34,5 @@ public: }; #endif //__EVTLISTENER_H_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.cpp b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.cpp index a5eea178f78b..c25536a52169 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.cpp +++ b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // stdafx.cpp : source file that includes just the standard includes // stdafx.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information @@ -10,3 +11,5 @@ #endif #include <atlimpl.cpp> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h index 199640620e6e..def66faf10db 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h +++ b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, // but are changed infrequently @@ -25,3 +26,5 @@ extern CComModule _Module; // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_STDAFX_H__E275407A_804A_477E_9A28_F5CA84E711C3__INCLUDED) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/EventListenerSample/EventListener/resource.h b/extensions/test/ole/EventListenerSample/EventListener/resource.h index 9446ddd2fca7..fef53bef1f1f 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/resource.h +++ b/extensions/test/ole/EventListenerSample/EventListener/resource.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by EventListener.rc @@ -15,3 +16,5 @@ #define _APS_NEXT_SYMED_VALUE 102 #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControl.cpp b/extensions/test/ole/MfcControl/MfcControl.cpp index e82c356fa77b..355476237f93 100644 --- a/extensions/test/ole/MfcControl/MfcControl.cpp +++ b/extensions/test/ole/MfcControl/MfcControl.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // MfcControl.cpp : Implementation of CMfcControlApp and DLL registration. #include "stdafx.h" @@ -77,3 +78,5 @@ STDAPI DllUnregisterServer(void) return NOERROR; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControl.h b/extensions/test/ole/MfcControl/MfcControl.h index a2877f135f2e..6c6a190b5b09 100644 --- a/extensions/test/ole/MfcControl/MfcControl.h +++ b/extensions/test/ole/MfcControl/MfcControl.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #if !defined(AFX_MFCCONTROL_H__AC221FBC_A0D8_11D4_833B_005004526AB4__INCLUDED_) #define AFX_MFCCONTROL_H__AC221FBC_A0D8_11D4_833B_005004526AB4__INCLUDED_ @@ -31,3 +32,5 @@ extern const WORD _wVerMinor; // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_MFCCONTROL_H__AC221FBC_A0D8_11D4_833B_005004526AB4__INCLUDED) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.cpp b/extensions/test/ole/MfcControl/MfcControlCtl.cpp index 52f6a0f4e8b5..9aab5e79a3ac 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.cpp +++ b/extensions/test/ole/MfcControl/MfcControlCtl.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // MfcControlCtl.cpp : Implementation of the CMfcControlCtrl ActiveX Control class. #include "stdafx.h" @@ -342,3 +343,5 @@ void CMfcControlCtrl::outObject(LPDISPATCH FAR* val) } // VT_I1 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.h b/extensions/test/ole/MfcControl/MfcControlCtl.h index 182793b0ee8d..ea06425a3fcd 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.h +++ b/extensions/test/ole/MfcControl/MfcControlCtl.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #if !defined(AFX_MFCCONTROLCTL_H__AC221FC3_A0D8_11D4_833B_005004526AB4__INCLUDED_) #define AFX_MFCCONTROLCTL_H__AC221FC3_A0D8_11D4_833B_005004526AB4__INCLUDED_ @@ -94,3 +95,5 @@ public: #endif // !defined(AFX_MFCCONTROLCTL_H__AC221FC3_A0D8_11D4_833B_005004526AB4__INCLUDED) // BYTE + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControlPpg.cpp b/extensions/test/ole/MfcControl/MfcControlPpg.cpp index 5b4ae48d57a9..66a098ba0384 100644 --- a/extensions/test/ole/MfcControl/MfcControlPpg.cpp +++ b/extensions/test/ole/MfcControl/MfcControlPpg.cpp @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // MfcControlPpg.cpp : Implementation of the CMfcControlPropPage property page class. #include "stdafx.h" @@ -74,3 +75,5 @@ void CMfcControlPropPage::DoDataExchange(CDataExchange* pDX) ///////////////////////////////////////////////////////////////////////////// // CMfcControlPropPage message handlers + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControlPpg.h b/extensions/test/ole/MfcControl/MfcControlPpg.h index abdaa53579f6..33f564c52ad4 100644 --- a/extensions/test/ole/MfcControl/MfcControlPpg.h +++ b/extensions/test/ole/MfcControl/MfcControlPpg.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #if !defined(AFX_MFCCONTROLPPG_H__AC221FC5_A0D8_11D4_833B_005004526AB4__INCLUDED_) #define AFX_MFCCONTROLPPG_H__AC221FC5_A0D8_11D4_833B_005004526AB4__INCLUDED_ @@ -44,3 +45,5 @@ protected: // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_MFCCONTROLPPG_H__AC221FC5_A0D8_11D4_833B_005004526AB4__INCLUDED) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/Resource.h b/extensions/test/ole/MfcControl/Resource.h index 02eeceee6a95..9cd92613f1fd 100644 --- a/extensions/test/ole/MfcControl/Resource.h +++ b/extensions/test/ole/MfcControl/Resource.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by MfcControl.rc @@ -18,3 +19,5 @@ #define _APS_NEXT_CONTROL_VALUE 201 #define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_COMMAND_VALUE 32768 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/StdAfx.cpp b/extensions/test/ole/MfcControl/StdAfx.cpp index 07f7b469ee43..b45da9a8edc8 100644 --- a/extensions/test/ole/MfcControl/StdAfx.cpp +++ b/extensions/test/ole/MfcControl/StdAfx.cpp @@ -1,5 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // stdafx.cpp : source file that includes just the standard includes // stdafx.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information #include "stdafx.h" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/StdAfx.h b/extensions/test/ole/MfcControl/StdAfx.h index 51a41fb7a98c..b0a8f50346c7 100644 --- a/extensions/test/ole/MfcControl/StdAfx.h +++ b/extensions/test/ole/MfcControl/StdAfx.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #if !defined(AFX_STDAFX_H__AC221FBA_A0D8_11D4_833B_005004526AB4__INCLUDED_) #define AFX_STDAFX_H__AC221FBA_A0D8_11D4_833B_005004526AB4__INCLUDED_ @@ -28,3 +29,5 @@ #include <comdef.h> #endif // !defined(AFX_STDAFX_H__AC221FBA_A0D8_11D4_833B_005004526AB4__INCLUDED_) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/OleClient/axhost.cxx b/extensions/test/ole/OleClient/axhost.cxx index 52c46d5af04e..5c96023af26c 100644 --- a/extensions/test/ole/OleClient/axhost.cxx +++ b/extensions/test/ole/OleClient/axhost.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. @@ -54,3 +55,4 @@ LRESULT HostWin::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, B +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/OleClient/axhost.hxx b/extensions/test/ole/OleClient/axhost.hxx index 78a04a9c7a89..9857eaa8e28d 100644 --- a/extensions/test/ole/OleClient/axhost.hxx +++ b/extensions/test/ole/OleClient/axhost.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. @@ -30,7 +31,6 @@ #include <atlbase.h> extern CComModule _Module; -//#include <atlwin.h> #include <atlcom.h> #include <atlhost.h> @@ -59,3 +59,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 894e0ca87aa2..fe780c7a2ecc 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.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. @@ -46,7 +47,6 @@ CComModule _Module; #include <com/sun/star/bridge/oleautomation/PropertyPutArgument.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/script/XInvocation.hpp> -//#include <oletest/XCallback.hpp> #include <com/sun/star/uno/Reference.h> #include <cppuhelper/servicefactory.hxx> #include <rtl/string.h> @@ -60,9 +60,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star::script; using namespace com::sun::star::bridge::oleautomation; using namespace cppu; -using namespace rtl; - +using ::rtl::OUString; Reference<XInvocation> convertComObject( IUnknown* pUnk); Reference<XInvocation> getComObject( OUString progId); @@ -1240,12 +1239,6 @@ HRESULT doTest() aAny <<= OUString( L" A string in an any"); aAny=invMfc->invoke( OUString(L"inVariant"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); - // Tests with Sequences later. - // OUString arStr4[]= {L"string0", L"string1", L"string2"}; - // Sequence<OUString> seqStr4( arStr4, 3); - // aAny <<= seqStr4; - // invMfc->invoke( OUString(L"inArray"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); - Reference < XInvocation > inv5= getComObject(L"AxTestComponents.Basic"); Any anyVal4; @@ -1323,3 +1316,4 @@ HRESULT doTest() //VARIANT_TRUE VT_UI1 +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index db79febb6354..5f2d1d8b6c90 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.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. @@ -49,9 +50,10 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::script; using namespace com::sun::star::bridge::oleautomation; -using namespace rtl; using namespace cppu; +using ::rtl::OUString; + template< class T > bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & returned); @@ -352,3 +354,5 @@ void printSequence( Sequence<Any>& val) MessageBox( NULL, A2T(buff), _T("clientTest: printing Sequence elements"), MB_OK); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index 71eaf12fbe70..c9955d40d169 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.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. @@ -62,7 +63,9 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace oletest; using namespace cppu; -using namespace rtl; + +using ::rtl::OUString; + HRESULT doTest(); HRESULT InitializeParameter(); void printResultVariantArray( VARIANT & var); @@ -654,3 +657,4 @@ void printVariant( VARIANT & _var) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/OleConverterVar1/smartarray.h b/extensions/test/ole/OleConverterVar1/smartarray.h index 273b43a9e6c8..13b5337cd11e 100644 --- a/extensions/test/ole/OleConverterVar1/smartarray.h +++ b/extensions/test/ole/OleConverterVar1/smartarray.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. @@ -231,3 +232,5 @@ template <> SmartArray <IUnknown*>::SmartArray(sourceType * parParams, int count SafeArrayUnaccessData( m_array); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index 2a72552d2024..2ee1e3364507 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.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. @@ -56,13 +57,11 @@ #include <oletest/XSimple2.hpp> #include <oletest/XSimple3.hpp> #include <oletest/XTestInParameters.hpp> -//#include <oletest/XTestOutParameters.hpp> #include <oletest/XIdentity.hpp> #include <com/sun/star/beans/Property.hpp> using namespace cppu; using namespace osl; using namespace oletest; -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; @@ -70,6 +69,8 @@ using namespace com::sun::star::registry; using namespace com::sun::star::script; using namespace com::sun::star::reflection; +using ::rtl::OUString; + #define IMPL_NAME L"oletest.OleTestImpl" // oletest.OleTestImpl in applicat.rdb #define SERVICE_NAME L"oletest.OleTest" @@ -280,29 +281,6 @@ public: // XTestSequence virtual Any SAL_CALL other_methodAny( const Any& rAny, const OUString& typeInAny ) throw (RuntimeException); - - // XTestOutParameters ------------------------------------------------------------------------ -// virtual void SAL_CALL out_test(sal_Int8 rIn) throw( RuntimeException ); - -// virtual void SAL_CALL out_methodByte(sal_Int8& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodFloat(float& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodDouble(double& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodBool(sal_Bool& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodShort(sal_Int16& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodUShort(sal_uInt16& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodLong(sal_Int32& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodULong(sal_uInt32& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodHyper(sal_Int64& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodString(OUString& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodChar(sal_Unicode& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodAny(Any& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException ); -// virtual void SAL_CALL out_methodMulParams1(sal_Int32& rout1, sal_Int32& rout2) throw( RuntimeException ); -// virtual void SAL_CALL out_methodMulParams2(sal_Int32& rout1, sal_Int32& rout2, OUString& rout3) throw( RuntimeException ); -// virtual void SAL_CALL out_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException ); - // XTestInParameters virtual sal_Int8 SAL_CALL in_methodByte( sal_Int8 rIn ) throw (RuntimeException); virtual float SAL_CALL in_methodFloat( float rIn ) throw (RuntimeException); @@ -385,7 +363,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, } catch(InvalidRegistryException &) { - OSL_ENSURE( sal_False, "### InvalidRegistryException!\n"); + OSL_FAIL( "### InvalidRegistryException!\n"); } } return sal_False; @@ -526,8 +504,7 @@ Sequence< Type > SAL_CALL OComponent::methodType(const Sequence< Type >& aSeq) t } return aSeq; } -//Sequence< Reference< XInterface> > SAL_CALL methodXInterface ( const Sequence< Reference < XInterface> >& aSeq) -// throw (RuntimeException) + Sequence< Reference< XInterface > > SAL_CALL OComponent::methodXInterface( const Sequence< Reference< XInterface > >& aSeq ) throw(RuntimeException) { for( sal_Int32 i= 0; i < aSeq.getLength(); i++) @@ -993,9 +970,6 @@ void SAL_CALL OComponent::testout_methodMulParams4( float in1, float& out1, sal_ void SAL_CALL OComponent::testout_methodXInterface( Reference< XInterface >& rOut ) throw(RuntimeException) { rOut = m_xinterface; -// OUString string( L"Property Any"); -// m_any <<= string; -// rOut= Reference<XInterface> (static_cast<XTestSequence*>(this), UNO_QUERY); } // XTestInParameters ------------------------------------------------------------ @@ -1250,17 +1224,6 @@ void SAL_CALL OComponent::testinout_methodXInterface2( Reference< XInterface > & Reference<XInterface> tmp = rOut; rOut = m_xinterface; m_xinterface = tmp; -// Reference<XTestSequence> xTest( rOut, UNO_QUERY); -// if( xTest.is()) -// { -// Any any= xTest->getAttrAny2(); -// OUString _s; -// any >>= _s; -// OUString string= _s + OUString((L" this string was written in the UNO component to the inout pararmeter")); -// any <<= string; -// xTest->setAttrAny2( any); -// } - } Any SAL_CALL OComponent::methodAnyTest1(const Any& rIn) throw( RuntimeException ) { @@ -1360,94 +1323,6 @@ Any SAL_CALL OComponent::other_methodAny( const Any& rAny, const OUString& typeI return rAny; } -// XTestOutParameters ============================================================================ -// void SAL_CALL OComponent::out_test(sal_Int8 rIn) throw( RuntimeException ) -// { -// } - -// void SAL_CALL OComponent::out_methodByte(sal_Int8& rOut) throw( RuntimeException ) -// { -// rOut= 100; -// } - -// void SAL_CALL OComponent::out_methodDouble(double& rOut) throw( RuntimeException ) -// { -// rOut= 3.14; -// } -// void SAL_CALL OComponent::out_methodFloat(float& rOut) throw( RuntimeException ) -// { -// rOut= 3.14; -// } -// void SAL_CALL OComponent::out_methodBool(sal_Bool& rOut) throw( RuntimeException ) -// { -// rOut= sal_True; -// } -// void SAL_CALL OComponent::out_methodShort(sal_Int16& rOut) throw( RuntimeException ) -// { -// rOut= -100; -// } -// void SAL_CALL OComponent::out_methodUShort(sal_uInt16& rOut) throw( RuntimeException ) -// { -// rOut= 100; -// } -// void SAL_CALL OComponent::out_methodLong(sal_Int32& rOut) throw( RuntimeException ) -// { -// rOut= -100; -// } - -// void SAL_CALL OComponent::out_methodULong(sal_uInt32& rOut) throw( RuntimeException ) -// { -// rOut= 100; -// } -// void SAL_CALL OComponent::out_methodHyper(sal_Int64& rOut) throw( RuntimeException ) -// { - -// } - -// void SAL_CALL OComponent::out_methodUHyper(sal_uInt64& rOut) throw( RuntimeException ) -// { -// } - -// void SAL_CALL OComponent::out_methodString(OUString& rOut) throw( RuntimeException ) -// { -// rOut= L"I'm a string"; -// } -// void SAL_CALL OComponent::out_methodChar(sal_Unicode& rOut) throw( RuntimeException ) -// { -// rOut= 'A'; -// } -// void SAL_CALL OComponent::out_methodAny(Any& rOut) throw( RuntimeException) -// { -// Any a; -// a <<= OUString( L"Hi"); -// rOut= a; -// } -// void SAL_CALL OComponent::out_methodSequence(Sequence< sal_Int32 >& rOut) throw( RuntimeException ) -// { -// Sequence< sal_Int32 > aseq(10); -// for( sal_Int16 i= 0; i < aseq.getLength(); i++) aseq.getArray()[i]= i; -// rOut= aseq; -// } -// void SAL_CALL OComponent::out_methodSequence2(Sequence< Sequence< sal_Int32 > >& rOut) throw( RuntimeException ) -// { -// rOut= Sequence< Sequence< sal_Int32 > >(); -// } -// void SAL_CALL OComponent::out_methodMulParams1(sal_Int32& rout1, sal_Int32& rout2) throw( RuntimeException ) -// { -// rout1= 111; -// rout2= 222; -// } -// void SAL_CALL OComponent::out_methodMulParams2(sal_Int32& rout1, sal_Int32& rout2, OUString& rout3) throw( RuntimeException ) -// { -// rout1= 111; -// rout2= 222; -// rout3= L"this is a neet little string"; -// } -// void SAL_CALL OComponent::out_methodMulParams3(const OUString& sin, OUString& sout) throw( RuntimeException ) -// { -// sout= L"this is a neet little string"; -// } - // XTestInterfaces ------------------------------------------------------------------------------------- void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallback, sal_Int32 mode ) throw(RuntimeException) { @@ -1469,8 +1344,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac sal_Int8 aByte; sal_Int16 aShort; sal_Int32 aLong; -// sal_uInt16 aUShort; -// sal_uInt32 aULong; switch( mode) { @@ -1588,8 +1461,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac sal_Int8 aByte; sal_Int16 aShort; sal_Int32 aLong; -// sal_uInt16 aUShort; -// sal_uInt32 aULong; xCallback->outValuesAll( xSimple, aSimpleStruct, aSimpleEnum, seqAny, aAny, aBool, aChar, aString, aFloat, aDouble, @@ -1639,7 +1510,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString::createFromAscii("This struct was created in OleTest"); + pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); SimpleStruct aStruct; any >>= aStruct; @@ -1788,7 +1659,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString::createFromAscii("This struct was created in OleTest"); + pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); any >>= aStruct; } } @@ -1880,25 +1751,10 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac Reference<XInterface> xIntCallback= oleFact->createInstance(L"XCallback_Impl.Callback"); Reference<XInvocation> xInv( xIntCallback, UNO_QUERY); -//Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence<Any >& aParams,Sequence< sal_Int16 >& aOutParamIndex, -// Sequence<Any >& aOutParam ); Sequence<sal_Int16> seqIndizes; Sequence<Any> seqOutParams; xInv->invoke( OUString( L"outValuesAll"), Sequence<Any>(), seqIndizes, seqOutParams); -// void outValuesAll( [out] oletest::XSimple outInterface, -// [out] SimpleStruct outStruct , -// [out] SimpleEnum outEnum, -// [out] sequence<any> outSeqAny, -// [out] any outAny, -// [out] boolean outBool, -// [out] char outChar, -// [out] string outString, -// [out] float outFloat, -// [out] double outDouble, -// [out] byte outByte, -// [out] short outShort, -// [out] long outLong); if( seqOutParams.getLength() == 12) { Reference<XSimple> xSimple= *(XSimple**)seqOutParams[0].getValue(); @@ -1959,7 +1815,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString::createFromAscii("This struct was created in OleTest"); + pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); any >>= aStruct; } } @@ -2026,8 +1882,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac break; } case 303: - // in parameter -// void inValues( [in] char aChar, [in] long aLong, [in] string aString); { Reference<XInterface> xIntFact = m_rFactory->createInstance( L"com.sun.star.bridge.oleautomation.Factory"); @@ -2082,7 +1936,6 @@ sal_Bool SAL_CALL OComponent::isSame( const Reference< XInterface >& val ) throw Reference< XInterface > SAL_CALL OComponent::getThis( ) throw (RuntimeException) { -// return Reference<XInterface>(static_cast<XIdentity*>(this), UNO_QUERY); Reference<XInterface> ret(static_cast<XIdentity*>(this), UNO_QUERY); return ret; } @@ -2122,3 +1975,5 @@ void SAL_CALL OComponent::testInterface2( const Reference< XSimple >& xSimple, } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/cpnt/makefile.mk b/extensions/test/ole/cpnt/makefile.mk index 5668d8453d24..65601edd9444 100644 --- a/extensions/test/ole/cpnt/makefile.mk +++ b/extensions/test/ole/cpnt/makefile.mk @@ -35,20 +35,6 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # --- Files -------------------------------------------------------- -#UNOUCRDEP= $(SOLARBINDIR)$/types.rdb $(BIN)$/oletest.rdb -#UNOUCRRDB= $(SOLARBINDIR)$/types.rdb $(BIN)$/oletest.rdb - -#UNOUCROUT= $(OUT)$/inc - -#UNOTYPES= oletest.XTestSequence \ -# oletest.XTestStruct \ -# oletest.XTestOther \ -# oletest.XTestInterfaces \ -# oletest.XSimple \ -# oletest.XSimple2 \ -# oletest.XSimple3 \ -# oletest.XTestInParameters \ -# oletest.XIdentity INCPRE+= -I$(ATL_INCLUDE) @@ -59,16 +45,11 @@ SHL1TARGET= $(TARGET) SHL1STDLIBS= \ $(SALLIB) \ - $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) -#.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" -# SHL1STDLIBS+= $(COMPATH)$/atlmfc$/lib$/atls.lib -#.ENDIF - .IF "$(COMEX)"=="8" || "$(COMEX)"=="10" -.IF "$(USE_STLP_DEBUG)" != "" +.IF "$(USE_DEBUG_RUNTIME)" != "" SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib .ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx index 49a2534dda38..80d93dfb731c 100644 --- a/extensions/test/ole/cppToUno/testcppuno.cxx +++ b/extensions/test/ole/cppToUno/testcppuno.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. @@ -53,7 +54,7 @@ using namespace com::sun::star::script; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::ModelDependent; using namespace cppu; -using namespace rtl; + HRESULT doTest(); bool incrementMultidimensionalIndex( sal_Int32 dimensions, @@ -217,3 +218,5 @@ bool incrementMultidimensionalIndex( } return ret; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/cpptest/cpptest.cxx b/extensions/test/ole/cpptest/cpptest.cxx index e393142fd311..ef6f44e5d1c7 100644 --- a/extensions/test/ole/cpptest/cpptest.cxx +++ b/extensions/test/ole/cpptest/cpptest.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. @@ -111,3 +112,5 @@ HRESULT doTest() return S_OK; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unloading/unloadTest.cxx b/extensions/test/ole/unloading/unloadTest.cxx index 2d604e4bcc5c..35ccd1ab1005 100644 --- a/extensions/test/ole/unloading/unloadTest.cxx +++ b/extensions/test/ole/unloading/unloadTest.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. @@ -32,7 +33,6 @@ #include<osl/module.hxx> #include <osl/time.h> #include <rtl/ustring.hxx> -#include <stdio.h> #include <cppuhelper/factory.hxx> #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/bootstrap.hxx> @@ -171,18 +171,6 @@ sal_Bool test3() Reference<XComponent> xcomp( context, UNO_QUERY); xcomp->dispose(); -// for (int i=0; i < 10; i++) -// { -// Reference<XSimpleRegistry> xreg= createSimpleRegistry(); -// xreg->open( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), -// sal_False, sal_False ); -// Reference< XComponentContext > context= bootstrap_InitialComponentContext(xreg); -// Reference<XComponent> xcomp( context, UNO_QUERY); -// xcomp->dispose(); -// -// } - -// return sal_True; return bTest1 && bTest2; } @@ -224,3 +212,5 @@ sal_Bool test4() return bTest1 && bTest2; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp b/extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp index 3ee34e553b38..a5d05fe90aa9 100644 --- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp +++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.cpp @@ -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,3 +34,4 @@ // TODO: reference any additional headers you need in STDAFX.H // and not in this file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h index 1ecfdd1e04ca..408c5cd1fa87 100644 --- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h +++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.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. @@ -54,3 +55,4 @@ extern CComModule _Module; #endif // !defined(AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/Test/Test.cpp b/extensions/test/ole/unoTocomCalls/Test/Test.cpp index 5f02b3a4840c..27a2229a4d5d 100644 --- a/extensions/test/ole/unoTocomCalls/Test/Test.cpp +++ b/extensions/test/ole/unoTocomCalls/Test/Test.cpp @@ -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. @@ -244,3 +245,5 @@ HRESULT doTest() } // VARIANT CComVariant VT_UNKNOWN VT_DISPATCH V_UI1 CComDispatchDriver WINAPI + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp index 90ae64e3f330..b8e9847b18a7 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp @@ -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. @@ -510,3 +511,4 @@ STDMETHODIMP CCallback::inSeqXEventListener( LPSAFEARRAY listeners, LPSAFEARRAY } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h index 845eb7e9b1e4..645f62c18c93 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.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. @@ -133,3 +134,5 @@ public: #endif //__CALLBACK_H_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp index f19cdfb65bb7..e3a738960ee5 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp @@ -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. @@ -78,3 +79,4 @@ STDMETHODIMP CSimple::get__implementedInterfaces(LPSAFEARRAY *pVal) return S_OK; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h index 5d2acc364ca2..c911cb325240 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.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. @@ -63,3 +64,4 @@ public: #endif //__SIMPLE_H_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp index f90d8dbf1166..38d4c2357e81 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.cpp @@ -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. @@ -37,3 +38,4 @@ #include <atlimpl.cpp> +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h index 1b183480ba29..0bb223891626 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.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. @@ -55,3 +56,4 @@ extern CComModule _Module; #endif // !defined(AFX_STDAFX_H__180FF556_6F5C_11D4_8330_005004526AB4__INCLUDED) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp index e9241d4866bc..eb5095730702 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp @@ -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. @@ -99,3 +100,4 @@ STDAPI DllUnregisterServer(void) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h index ba5c1f9eb97d..afdbe7bcd552 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.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. @@ -44,3 +45,4 @@ #endif #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/pgp/makefile.mk b/extensions/test/pgp/makefile.mk index 9fe20937d2b7..96b7883e9e7a 100644 --- a/extensions/test/pgp/makefile.mk +++ b/extensions/test/pgp/makefile.mk @@ -25,23 +25,18 @@ # #************************************************************************* - - PRJ=..$/.. PRJNAME := extensions -#PACKAGE := com$/sun$/star$/pgp PACKAGE := TARGET := test_com_sun_star_pgp - # --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk +.INCLUDE : settings.mk # Files -------------------------------------------------------- - APPLICATRDB := $(SOLARBINDIR)$/applicat.rdb RDB := $(APPLICATRDB) @@ -52,51 +47,6 @@ GENJAVACLASSFILES= \ $(CLASSDIR)$/com$/sun$/star$/beans$/PropertyState.class \ $(CLASSDIR)$/com$/sun$/star$/container$/XSet.class \ - -#$(CLASSDIR)$/com$/sun$/star$/awt$/FocusEvent.class - -# $(CLASSDIR)$/com$/sun$/star$/awt$/InputEvent.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/KeyEvent.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/MouseEvent.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/WindowEvent.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/PaintEvent.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/Rectangle.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/XFocusListener.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/XKeyListener.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/XMouseListener.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/XMouseMotionListener.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/XWindow.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/XWindowListener.class \ -# $(CLASSDIR)$/com$/sun$/star$/awt$/XPaintListener.class \ -# $(CLASSDIR)$/com$/sun$/star$/bridge$/XBridge.class \ -# $(CLASSDIR)$/com$/sun$/star$/container$/XIndexAccess.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/FrameAction.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/FrameActionEvent.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/XComponentLoader.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/XController.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/XFrame.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/XFrameActionListener.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/XFrames.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/XFramesSupplier.class \ -# $(CLASSDIR)$/com$/sun$/star$/frame$/XModel.class \ -# $(CLASSDIR)$/com$/sun$/star$/io$/BufferSizeExceededException.class \ -# $(CLASSDIR)$/com$/sun$/star$/io$/NotConnectedException.class \ -# $(CLASSDIR)$/com$/sun$/star$/io$/XInputStream.class \ -# $(CLASSDIR)$/com$/sun$/star$/io$/XOutputStream.class \ -# $(CLASSDIR)$/com$/sun$/star$/lang$/IndexOutOfBoundsException.class \ -# $(CLASSDIR)$/com$/sun$/star$/lang$/XComponent.class \ -# $(CLASSDIR)$/com$/sun$/star$/lang$/XMultiServiceFactory.class \ -# $(CLASSDIR)$/com$/sun$/star$/lang$/XServiceInfo.class \ -# $(CLASSDIR)$/com$/sun$/star$/text$/XSimpleText.class \ -# $(CLASSDIR)$/com$/sun$/star$/text$/XText.class \ -# $(CLASSDIR)$/com$/sun$/star$/text$/XTextContent.class \ -# $(CLASSDIR)$/com$/sun$/star$/text$/XTextCursor.class \ -# $(CLASSDIR)$/com$/sun$/star$/text$/XTextDocument.class \ -# $(CLASSDIR)$/com$/sun$/star$/text$/XTextRange.class \ -# $(CLASSDIR)$/com$/sun$/star$/uno$/XNamingService.class \ -# $(CLASSDIR)$/com$/sun$/star$/uno$/Enum.class - - JAVACLASSFILES= \ $(CLASSDIR)$/$(PACKAGE)$/TestPGP.class @@ -105,10 +55,8 @@ TYPES={$(subst,.class, $(subst,$/,. $(subst,$(CLASSDIR)$/,-T $(GENJAVACLASSFIL GENJAVAFILES = {$(subst,.class,.java $(subst,$/class, $(GENJAVACLASSFILES)))} JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) $(GENJAVAFILES) - # --- Targets ------------------------------------------------------ - .IF "$(depend)" == "" ALL : $(GENJAVAFILES) ALLTAR .ELSE @@ -118,7 +66,6 @@ ALL: ALLDEP .INCLUDE : target.mk $(GENJAVAFILES) : $(RDB) -# javamaker -BUCR -O$(OUT) $(TYPES) $(RDB) javamaker @$(mktmp -BUCR -O$(OUT) $(TYPES) $(RDB)) $(JAVACLASSFILES) : $(GENJAVAFILES) diff --git a/extensions/test/sax/factory.hxx b/extensions/test/sax/factory.hxx index dc51457404c8..267e7b6649ee 100644 --- a/extensions/test/sax/factory.hxx +++ b/extensions/test/sax/factory.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. @@ -29,3 +30,4 @@ UString OSaxWriterTest_getServiceName( ) THROWS( () ); UString OSaxWriterTest_getImplementationName( ) THROWS( () ); Sequence<UString> OSaxWriterTest_getSupportedServiceNames( ) THROWS( () ); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/sax/makefile.mk b/extensions/test/sax/makefile.mk index 4e72ec987893..62e2706dd1e7 100644 --- a/extensions/test/sax/makefile.mk +++ b/extensions/test/sax/makefile.mk @@ -46,9 +46,8 @@ LIB1OBJFILES= $(OBJFILES) SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ - $(VOSLIB) \ $(SALLIB) \ - $(TOOLSLIB) + $(TOOLSLIB) SHL1LIBS= $(LIB1TARGET) SHL1IMPLIB= i$(TARGET) diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx index e7f52fbb0902..67ea67a31038 100644 --- a/extensions/test/sax/testsax.cxx +++ b/extensions/test/sax/testsax.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. @@ -34,11 +35,9 @@ #include <rtl/wstring.hxx> #include <osl/time.h> -//#include <vos/dynload.hxx> -//#include <vos/diagnose.hxx> #include <usr/weak.hxx> #include <tools/string.hxx> -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> #include <smart/com/sun/star/io/XOutputStream.hxx> #include <smart/com/sun/star/xml/sax/SAXParseException.hxx> @@ -52,11 +51,8 @@ #include "factory.hxx" -using namespace rtl; -using namespace vos; using namespace usr; - #define BUILD_ERROR(expr, Message)\ {\ m_seqErrors.realloc( m_seqErrors.getLen() + 1 ); \ @@ -111,13 +107,9 @@ using namespace usr; /**** * test szenarios : -* -* -* ****/ - class OSaxParserTest : public XSimpleTest, public OWeakObject @@ -167,8 +159,6 @@ private: /** * for external binding -* -* **/ XInterfaceRef OSaxParserTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)) { @@ -909,3 +899,4 @@ UNO_INTERFACE(XInterface) EXTERN_SERVICE_CALLTYPE exService_getFactory } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx index de606006ef90..1f778092e2eb 100644 --- a/extensions/test/sax/testwriter.cxx +++ b/extensions/test/sax/testwriter.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -//#include <tools/presys.h> #include <vector> -//#include <tools/postsys.h> #include <smart/com/sun/star/test/XSimpleTest.hxx> #include <smart/com/sun/star/lang/XMultiServiceFactory.hxx> // for the multiservice-factories @@ -52,8 +51,6 @@ #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE using namespace std; -using namespace rtl; -using namespace vos; using namespace usr; #define BUILD_ERROR(expr, Message)\ @@ -110,9 +107,6 @@ using namespace usr; /**** * test szenarios : -* -* -* ****/ @@ -335,8 +329,10 @@ UString AttributeListImpl::getTypeByName( const UString& sName ) THROWS( (UsrSys { vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin(); - for( ; ii != m_pImpl->vecAttribute.end() ; ii ++ ) { - if( (*ii).sName == sName ) { + for (; ii != m_pImpl->vecAttribute.end(); ++ii) + { + if( (*ii).sName == sName ) + { return (*ii).sType; } } @@ -347,8 +343,10 @@ UString AttributeListImpl::getValueByName(const UString& sName) THROWS( (UsrSyst { vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin(); - for( ; ii != m_pImpl->vecAttribute.end() ; ii ++ ) { - if( (*ii).sName == sName ) { + for (; ii != m_pImpl->vecAttribute.end(); ++ii) + { + if( (*ii).sName == sName ) + { return (*ii).sValue; } } @@ -396,20 +394,8 @@ void AttributeListImpl::clear() OSL_ASSERT( ! getLength() ); } - - - - - - - - - - /** * for external binding -* -* **/ XInterfaceRef OSaxWriterTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)) { @@ -749,8 +735,6 @@ void OSaxWriterTest::testPerformance(const XExtendedDocumentHandlerRef &r ) r->ignorableWhitespace( L""); r->startElement( L"huhu" , rList ); r->characters( testParagraph ); -// writeParagraph( r , testParagraph ); - r->ignorableWhitespace( L""); r->endElement( L"huhu" ); } @@ -770,3 +754,5 @@ void OSaxWriterTest::testPerformance(const XExtendedDocumentHandlerRef &r ) printf( "Performance writing : %g s\n" , fEnd - fStart ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx index 971743ccd6b5..2d75769d2c89 100644 --- a/extensions/test/stm/datatest.cxx +++ b/extensions/test/stm/datatest.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. @@ -45,15 +46,14 @@ #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE #include <usr/weak.hxx> // OWeakObject -#include <vos/conditn.hxx> -#include <vos/mutex.hxx> -#include <vos/thread.hxx> +#include <osl/conditn.hxx> +#include <osl/mutex.hxx> +#include <osl/thread.hxx> #include <string.h> #include "testfactreg.hxx" -using namespace vos; using namespace usr; #define DATASTREAM_TEST_MAX_HANDLE 1 @@ -1068,3 +1068,4 @@ UString OObjectStreamTest_getImplementationName( int i) THROWS( () ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/stm/makefile.mk b/extensions/test/stm/makefile.mk index aa506fcb34af..ac31f76fb805 100644 --- a/extensions/test/stm/makefile.mk +++ b/extensions/test/stm/makefile.mk @@ -42,9 +42,8 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) LIB1TARGET= $(SLB)$/$(TARGET).lib SHL1STDLIBS= \ - $(VOSLIB) \ $(SALLIB) \ - $(TOOLSLIB) + $(TOOLSLIB) LIB1OBJFILES= $(OBJFILES) SHL1LIBS= $(LIB1TARGET) diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx index 6ddd552a6ad0..d5a389691cc2 100644 --- a/extensions/test/stm/marktest.cxx +++ b/extensions/test/stm/marktest.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. @@ -41,16 +42,15 @@ #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE #include <usr/weak.hxx> // OWeakObject -#include <vos/conditn.hxx> -#include <vos/mutex.hxx> -#include <vos/thread.hxx> +#include <osl/conditn.hxx> +#include <osl/mutex.hxx> +#include <osl/thread.hxx> #include <string.h> #include "testfactreg.hxx" -using namespace vos; using namespace usr; class OMarkableOutputStreamTest : @@ -364,19 +364,8 @@ void OMarkableOutputStreamTest::testSimple( const XOutputStreamRef &rOutput } -/*** -* the test methods -* -****/ - - - - - /** * for external binding -* -* **/ XInterfaceRef OMarkableOutputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)) { @@ -414,7 +403,6 @@ UString OMarkableOutputStreamTest_getImplementationName() THROWS( () ) //----------------------------------------------------- // Input stream - class OMarkableInputStreamTest : public XSimpleTest, public OWeakObject @@ -637,19 +625,8 @@ void OMarkableInputStreamTest::testSimple( const XOutputStreamRef &rOutput rInput->closeInput(); } -/*** -* the test methods -* -****/ - - - - - /** * for external binding -* -* **/ XInterfaceRef OMarkableInputStreamTest_CreateInstance( const XMultiServiceFactoryRef & rSMgr ) THROWS((Exception)) { @@ -677,3 +654,5 @@ UString OMarkableInputStreamTest_getImplementationName() THROWS( () ) { return L"test.com.sun.star.extensions.stm.MarkableInputStream"; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx index b38cafd2952f..2de45fa0a2f5 100644 --- a/extensions/test/stm/pipetest.cxx +++ b/extensions/test/stm/pipetest.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. @@ -38,9 +39,9 @@ #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE #include <usr/weak.hxx> // OWeakObject -#include <vos/conditn.hxx> -#include <vos/mutex.hxx> -#include <vos/thread.hxx> +#include <osl/conditn.hxx> +#include <osl/mutex.hxx> +#include <osl/thread.hxx> #include <string.h> @@ -48,11 +49,10 @@ #define IMPLEMENTATION_NAME L"test.com.sun.star.comp.extensions.stm.Pipe" #define SERVICE_NAME L"test.com.sun.star.io.Pipe" -using namespace vos; using namespace usr; class WriteToStreamThread : - public OThread + public osl::Thread { public: @@ -367,7 +367,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r ) Sequence<BYTE> seqRead; // deletes itself - OThread *p = new WriteToStreamThread( output, iMax ); + osl::Thread *p = new WriteToStreamThread( output, iMax ); ERROR_ASSERT( p , "couldn't create thread for testing !\n" ); @@ -444,3 +444,5 @@ UString OPipeTest_getImplementationName() THROWS( () ) { return IMPLEMENTATION_NAME; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/stm/testfactreg.cxx b/extensions/test/stm/testfactreg.cxx index 698404f9d61b..cd4b07ddb434 100644 --- a/extensions/test/stm/testfactreg.cxx +++ b/extensions/test/stm/testfactreg.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. @@ -35,7 +36,6 @@ #include "testfactreg.hxx" -using namespace vos; using namespace usr; #ifdef __cplusplus @@ -168,3 +168,4 @@ Sequence<BYTE> createIntSeq( INT32 i ) return createSeq( pcCount ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/stm/testfactreg.hxx b/extensions/test/stm/testfactreg.hxx index 1d5a261549cf..81c22d00b351 100644 --- a/extensions/test/stm/testfactreg.hxx +++ b/extensions/test/stm/testfactreg.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. @@ -108,3 +109,5 @@ Sequence<BYTE> createIntSeq( INT32 i ); return; \ } \ ((void)0) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src index 4700d3380e3f..cfe1db5de2a0 100644 --- a/extensions/util/hidother.src +++ b/extensions/util/hidother.src @@ -104,7 +104,7 @@ hidspecial HID_EVT_APPROVEROWCHANGE { HelpId = HID_EVT_APPROVEROWCHA hidspecial HID_EVT_BEFOREUPDATE { HelpId = HID_EVT_BEFOREUPDATE; } hidspecial HID_EVT_CHANGED { HelpId = HID_EVT_CHANGED; } hidspecial HID_EVT_CONFIRMDELETE { HelpId = HID_EVT_CONFIRMDELETE; } -hidspecial HID_EVT_ERROROCCURED { HelpId = HID_EVT_ERROROCCURED; } +hidspecial HID_EVT_ERROROCCURRED { HelpId = HID_EVT_ERROROCCURRED; } hidspecial HID_EVT_FOCUSGAINED { HelpId = HID_EVT_FOCUSGAINED; } hidspecial HID_EVT_FOCUSLOST { HelpId = HID_EVT_FOCUSLOST; } hidspecial HID_EVT_ITEMSTATECHANGED { HelpId = HID_EVT_ITEMSTATECHANGED; } @@ -207,6 +207,7 @@ hidspecial HID_PROP_FOCUSONCLICK { HelpId = HID_PROP_FOCUSONCLICK hidspecial HID_PROP_FONT { HelpId = HID_PROP_FONT; } hidspecial HID_PROP_FORMATKEY { HelpId = HID_PROP_FORMATKEY; } hidspecial HID_PROP_GROUPBOX { HelpId = HID_PROP_GROUPBOX; } +hidspecial HID_PROP_GROUP_NAME { HelpId = HID_PROP_GROUP_NAME; } hidspecial HID_PROP_HEIGHT { HelpId = HID_PROP_HEIGHT; } hidspecial HID_PROP_HELPTEXT { HelpId = HID_PROP_HELPTEXT; } hidspecial HID_PROP_HELPURL { HelpId = HID_PROP_HELPURL; } @@ -354,7 +355,7 @@ hidspecial UID_BRWEVT_APPROVEROWCHANGE { HelpId = UID_BRWEVT_APPROVEROW hidspecial UID_BRWEVT_BEFOREUPDATE { HelpId = UID_BRWEVT_BEFOREUPDATE; } hidspecial UID_BRWEVT_CHANGED { HelpId = UID_BRWEVT_CHANGED; } hidspecial UID_BRWEVT_CONFIRMDELETE { HelpId = UID_BRWEVT_CONFIRMDELETE; } -hidspecial UID_BRWEVT_ERROROCCURED { HelpId = UID_BRWEVT_ERROROCCURED; } +hidspecial UID_BRWEVT_ERROROCCURRED { HelpId = UID_BRWEVT_ERROROCCURRED; } hidspecial UID_BRWEVT_FOCUSGAINED { HelpId = UID_BRWEVT_FOCUSGAINED; } hidspecial UID_BRWEVT_FOCUSLOST { HelpId = UID_BRWEVT_FOCUSLOST; } hidspecial UID_BRWEVT_ITEMSTATECHANGED { HelpId = UID_BRWEVT_ITEMSTATECHANGED; } diff --git a/extensions/workben/makefile.mk b/extensions/workben/makefile.mk index 759ee81186b2..d62100ac26c5 100644 --- a/extensions/workben/makefile.mk +++ b/extensions/workben/makefile.mk @@ -32,11 +32,6 @@ TARGET=workben LIBTARGET=NO TESTAPP=testpgp -#TESTAPP=testcomponent -#TESTAPP=pythontest -#TESTAPP=pythonautotest -#TESTAPP=testresource -#TESTAPP=testframecontrol .IF "$(TESTAPP)" == "testresource" || "$(TESTAPP)" == "testframecontrol" TARGETTYPE=GUI @@ -83,7 +78,6 @@ APP1OBJS= $(OBJFILES) APP1STDLIBS= \ $(CPPUHELPERLIB)\ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) .ENDIF # testpgp @@ -98,7 +92,6 @@ OBJFILES= $(OBJ)$/testcomponent.obj APP2TARGET = testcomponent APP2OBJS = $(OBJ)$/testcomponent.obj APP2STDLIBS = \ - $(VOSLIB) \ $(TOOLSLIB) \ $(SALLIB) @@ -108,28 +101,14 @@ APP2STDLIBS = \ # test python. # .IF "$(TESTAPP)" == "phytontest" - OBJFILES= $(OBJ)$/pythontest.obj - -#APP4TARGET= pythontest -#APP4OBJS= $(OBJ)$/pythontest.obj -#APP4STDLIBS=$(TOOLSLIB) \ -# $(VOSLIB) - .ENDIF # phytontest # # python auto test # .IF "$(TESTAPP)" == "phytonautotest" - OBJFILES= $(OBJ)$/pythonautotest.obj - -#APP5TARGET= pythonautotest -#APP5OBJS = $(OBJ)$/pythonautotest.obj -#APP5STDLIBS=$(TOOLSLIB) \ -# $(VOSLIB) - .ENDIF # phytonautotest # @@ -162,7 +141,6 @@ OBJFILES= $(OBJ)$/testframecontrol.obj APP3TARGET= testframecontrol APP3OBJS= $(OBJ)$/testframecontrol.obj APP3STDLIBS=$(TOOLSLIB) \ - $(VOSLIB) \ $(SVTOOLLIB) \ $(VCLLIB) diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index eb5a52470bcc..e0d3469476b9 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.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. @@ -33,19 +34,19 @@ #include <stardiv/uno/beans/exactname.hxx> #include <rtl/ustring.hxx> -#include <vos/dynload.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <usr/services.hxx> #include <vcl/svapp.hxx> #include <usr/ustring.hxx> #include <usr/weak.hxx> #include <tools/string.hxx> -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> -using namespace rtl; -using namespace vos; using namespace usr; +using ::rtl::StringToOUString; +using ::rtl::OUStringToString; + #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM) #define USTRING_TO_PCHAR(x) OUStringToString(x , CHARSET_DONTKNOW ).GetCharStr() @@ -278,7 +279,7 @@ public: void cmdLine(); protected: - OCondition m_aDebugCondition; + osl::Condition m_aDebugCondition; XDebuggingRef *m_pDebuggingRef; }; @@ -621,3 +622,4 @@ int __LOADONCALLAPI main (int argc, char **argv) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index 34a86ef00194..7f480af53c05 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.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. @@ -34,19 +35,20 @@ #include <stardiv/uno/beans/exactname.hxx> #include <rtl/ustring.hxx> -#include <vos/dynload.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <usr/services.hxx> #include <vcl/svapp.hxx> #include <usr/ustring.hxx> #include <usr/weak.hxx> #include <tools/string.hxx> -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> -using namespace rtl; -using namespace vos; using namespace usr; +using ::rtl::OUStringToString; +using ::rtl::StringToOUString; + + #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM) @@ -151,7 +153,7 @@ public: void cmdLine(); protected: - OCondition m_aDebugCondition; + osl::Condition m_aDebugCondition; XDebuggingRef *m_pDebuggingRef; XEngineRef *m_pEngineRef; XInvokationRef *m_pInvokationRef; @@ -555,3 +557,4 @@ int __LOADONCALLAPI main (int argc, char **argv) return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 3ac3c634f2c3..ece2570df35c 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.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. @@ -39,22 +40,22 @@ #include <stdio.h> #include <smart/com/sun/star/registry/XImplementationRegistration.hxx> #include <smart/com/sun/star/lang/XComponent.hxx> -//#include <com/sun/star/registry/ stardiv/uno/repos/simplreg.hxx> -#include <vos/dynload.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <usr/services.hxx> #include <vcl/svapp.hxx> #include <usr/ustring.hxx> #include <tools/string.hxx> -#include <vos/conditn.hxx> +#include <osl/conditn.hxx> #include <smart/com/sun/star/test/XSimpleTest.hxx> -using namespace rtl; -using namespace vos; using namespace usr; +using ::rtl::OString; +using ::rtl::OWStringToOString; +using ::rtl::OStringToOWString; + // Needed to switch on solaris threads #ifdef SOLARIS @@ -86,15 +87,10 @@ int __LOADONCALLAPI main (int argc, char **argv) try { // Create registration service XInterfaceRef x = xSMgr->createInstance( - UString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) ); + UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" )) ); x->queryInterface( XImplementationRegistration::getSmartUik() , xReg ); -/* x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" ); - OSL_ASSERT( x.is() ); - x->queryInterface( XSimpleRegistry::getSmartUik() , xSimpleReg ); - OSL_ASSERT( xSimpleReg.is() ); - xSimpleReg->open( L"testcomp.rdb" , FALSE , TRUE ); -*/ } + } catch( Exception& e ) { printf( "%s\n" , OWStringToOString( e.getName() , CHARSET_SYSTEM ).getStr() ); exit(1); @@ -110,7 +106,7 @@ int __LOADONCALLAPI main (int argc, char **argv) UString aDllName( OStringToOWString( szBuf, CHARSET_SYSTEM ) ); xReg->registerImplementation( - UString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )), aDllName, xSimpleReg ); } @@ -131,7 +127,7 @@ int __LOADONCALLAPI main (int argc, char **argv) ORealDynamicLoader::computeModuleName( sTestName.getStr() , szBuf, 1024 ); UString aDllName = OStringToOWString( szBuf, CHARSET_SYSTEM ); xReg->registerImplementation( - UString::createFromAscii( "com.sun.star.loader.SharedLibrary" ) , + UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )) , aDllName, xSimpleReg ); } @@ -220,3 +216,5 @@ int __LOADONCALLAPI main (int argc, char **argv) rComp->dispose(); return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx index 16144f170f97..11025e604648 100644 --- a/extensions/workben/testframecontrol.cxx +++ b/extensions/workben/testframecontrol.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. @@ -28,9 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_extensions.hxx" -//#include <vos/mutex.hxx> -#include <vos/dynload.hxx> - #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> @@ -45,7 +43,6 @@ #include <svtools/unoiface.hxx> -using namespace vos; using namespace usr; //================================================================================================== @@ -318,3 +315,5 @@ void FrameControlApplication::ShowStatusText( const XubString& rStatus ) { Application::GetAppWindow()->SetText( rStatus ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index 00337f79a3b7..0773dc711646 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.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. @@ -32,11 +33,8 @@ #ifndef _RTL_WSTRING_ #include <rtl/wstring> #endif -#include <vos/macros.hxx> -#ifndef _USR_SMARTSERVICES_HXX_ #include <usr/smartservices.hxx> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> @@ -283,7 +281,7 @@ sal_Int32 SAL_CALL DataSource_Impl::readBytes ( throw IOException(); sal_Int32 k = m_buffer.getLength() - m_position; - k = VOS_BOUND(k, 0, nBytesToRead); + k = SAL_BOUND(k, 0, nBytesToRead); if (k > 0) { rData.realloc(k); @@ -514,75 +512,6 @@ inline rtl::OWString S2U (const sal_Char *ascii) return rtl::OWString::createFromAscii (ascii); } -#if 0 /* OLD */ - -/* - * queryModuleActivator. - */ -BOOL queryModuleActivator ( - const XServiceManagerRef &rxManager, - XServiceActivatorRef &rxActivator) -{ - XServiceProviderRef xProv; - XInterfaceRef xProvInst; - - xProv = rxManager->queryServiceProvider ( - L"stardiv.uno.ServiceActivator.module"); - if (!xProv.is()) - { - printf ("Error: no ServiceActivator service.\n"); - return FALSE; - } - - xProvInst = xProv->createInstance(); - if (!xProvInst.is()) - { - printf ("Error: no ServiceActivator instance.\n"); - return FALSE; - } - - return xProvInst->queryInterface ( - XServiceActivator::getSmartUik(), rxActivator); -} - -/* - * install. - */ -BOOL install ( - const XServiceActivatorRef &rxActivator, - const char *prefix) -{ - String aModule ("module://"); - char pBuffer[1024]; - - vos::ORealDynamicLoader::computeModuleName ( - prefix, pBuffer, sizeof(pBuffer)); - aModule += pBuffer; - - return rxActivator->install ( - StringToUString (aModule, CHARSET_SYSTEM)); -} - -/* - * uninstall. - */ -BOOL uninstall ( - const XServiceActivatorRef &rxActivator, - const char *prefix) -{ - String aModule ("module://"); - char pBuffer[1024]; - - vos::ORealDynamicLoader::computeModuleName ( - prefix, pBuffer, sizeof(pBuffer)); - aModule += pBuffer; - - return rxActivator->deinstall ( - StringToUString (aModule, CHARSET_SYSTEM)); -} - -#endif /* OLD */ - /* * main. */ @@ -677,17 +606,7 @@ int SAL_CALL main (int argc, char **argv) if (nOptions & OPTION_INSTALL) { -#if 0 /* OLD */ - XServiceActivatorRef xActivator; - if (queryModuleActivator (xManager, xActivator)) - { - if (install (xActivator, "pgp")) - printf ("Module PGP installed.\n"); - else - printf ("Error: module PGP not installed.\n"); - } - nOptions &= ~OPTION_INSTALL; -#endif /* OLD */ + } if (nOptions & (OPTION_DECRYPT | OPTION_ENCRYPT | OPTION_SIGN)) @@ -757,8 +676,7 @@ int SAL_CALL main (int argc, char **argv) S2U("mhu@rabbit") }; - sal_Int32 nRecipients = - sizeof(aRecipients) / sizeof(aRecipients[0]); + sal_Int32 nRecipients = SAL_N_ELEMENTS(aRecipients); if (nOptions & OPTION_SIGN) { @@ -826,19 +744,10 @@ int SAL_CALL main (int argc, char **argv) if (nOptions & OPTION_UNINSTALL) { -#if 0 /* OLD */ - XServiceActivatorRef xActivator; - if (queryModuleActivator (xManager, xActivator)) - { - if (uninstall (xActivator, "pgp")) - printf ("Module PGP uninstalled.\n"); - else - printf ("Error: module PGP not uninstalled.\n"); - } - nOptions &= ~OPTION_UNINSTALL; -#endif /* OLD */ + } return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx index d073d30ad590..eca30044bbdc 100644 --- a/extensions/workben/testresource.cxx +++ b/extensions/workben/testresource.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. @@ -32,14 +33,12 @@ #include <smart/com/sun/star/script/XInvocation.hxx> #include <rtl/ustring.hxx> -#include <vos/dynload.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <usr/services.hxx> #include <vcl/svapp.hxx> -using namespace rtl; -using namespace vos; using namespace usr; +using ::rtl::StringToOUString; class MyApp : public Application { @@ -78,15 +77,16 @@ void MyApp::Main() Args.getArray()[0].setINT32( 1000 ); BOOL b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL(); - VOS_ENSHURE( b, "hasString" ); + OSL_ENSURE( b, "hasString" ); UString aStr = xResLoader->invoke( L"getString", Args, OutPos, OutArgs ).getString(); - VOS_ENSHURE( aStr == L"Hello", "getString" ); + OSL_ENSURE( aStr == L"Hello", "getString" ); Args.getArray()[0].setINT32( 1001 ); b = xResLoader->invoke( L"hasString", Args, OutPos, OutArgs ).getBOOL(); - VOS_ENSHURE( !b, "!hasString" ); + OSL_ENSURE( !b, "!hasString" ); xReg->revokeImplementation( aDllName, XSimpleRegistryRef() ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |