mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS mba32issues02

Browse Source 
2009-09-17 mb93783 merge commit
2009-09-03 tb121644 #i104748 - slot unification to .uno:PasteSpecial
2009-09-01 mba #101455#: code simplification
2009-08-31 mb93783 iso locales for norwegian builds are nb and nn, not no
2009-08-25 mba merge to m55
2009-07-29 mba cleanup after rebase
2009-07-29 mba #i103200#: wrong order of first and last name in CJK UI
2009-07-27 mba adding dictionary changes from broken svn CWS
2009-07-27 mba adding dictionary changes from broken svn CWS
2009-07-27 mba apply patch from broken svn CWS
This commit is contained in:
Jens-Heiner Rechtien
2009-09-18 10:15:03 +00:00
parent 87f5ad0c1a
commit 3663a7fc59
5 changed files with 120 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dtrans/source/X11/X11_clipboard.cxx
View File

@@ -146,6 +146,8 @@ void X11Clipboard::clearContents()
// inform previous owner of lost ownership // inform previous owner of lost ownership
if ( xOwner.is() ) if ( xOwner.is() )
xOwner->lostOwnership(xThis, m_aContents); xOwner->lostOwnership(xThis, m_aContents);
fireChangedContentsEvent();
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

13
sax/source/expatwrap/sax_expat.cxx
View File

@@ -136,6 +136,11 @@ OUString XmlChar2OUString( const XML_Char *p )
pThis->rDocumentLocator->getColumnNumber()\ pThis->rDocumentLocator->getColumnNumber()\
) );\ ) );\
}\ }\
catch( com::sun::star::uno::RuntimeException &e ) {\
pThis->bExceptionWasThrown = sal_True; \
pThis->bRTExceptionWasThrown = sal_True; \
pImpl->rtexception = e; \
}\
}\ }\
((void)0) ((void)0)
@@ -256,7 +261,9 @@ public: // module scope
// Exception cannot be thrown through the C-XmlParser (possible resource leaks), // Exception cannot be thrown through the C-XmlParser (possible resource leaks),
// therefor the exception must be saved somewhere. // therefor the exception must be saved somewhere.
SAXParseException exception; SAXParseException exception;
sal_Bool bExceptionWasThrown; RuntimeException rtexception;
sal_Bool bExceptionWasThrown;
sal_Bool bRTExceptionWasThrown;
Locale locale; Locale locale;
@@ -437,6 +444,7 @@ SaxExpatParser::SaxExpatParser( )
m_pImpl->rAttrList = Reference< XAttributeList > ( m_pImpl->pAttrList ); m_pImpl->rAttrList = Reference< XAttributeList > ( m_pImpl->pAttrList );
m_pImpl->bExceptionWasThrown = sal_False; m_pImpl->bExceptionWasThrown = sal_False;
m_pImpl->bRTExceptionWasThrown = sal_False;
} }
SaxExpatParser::~SaxExpatParser() SaxExpatParser::~SaxExpatParser()
@@ -737,6 +745,9 @@ void SaxExpatParser_Impl::parse( )
if( ! bContinue || this->bExceptionWasThrown ) { if( ! bContinue || this->bExceptionWasThrown ) {
if ( this->bRTExceptionWasThrown )
throw rtexception;
// Error during parsing ! // Error during parsing !
XML_Error xmlE = XML_GetErrorCode( getEntity().pParser ); XML_Error xmlE = XML_GetErrorCode( getEntity().pParser );
OUString sSystemId = rDocumentLocator->getSystemId(); OUString sSystemId = rDocumentLocator->getSystemId();

33
svtools/inc/eventcfg.hxx
View File

@@ -40,6 +40,35 @@
#include <hash_map> #include <hash_map>
#include <vector> #include <vector>
#define STR_EVENT_STARTAPP 0
#define STR_EVENT_CLOSEAPP 1
#define STR_EVENT_DOCCREATED 2
#define STR_EVENT_CREATEDOC 3
#define STR_EVENT_LOADFINISHED 4
#define STR_EVENT_OPENDOC 5
#define STR_EVENT_PREPARECLOSEDOC 6
#define STR_EVENT_CLOSEDOC 7
#define STR_EVENT_SAVEDOC 8
#define STR_EVENT_SAVEDOCDONE 9
#define STR_EVENT_SAVEDOCFAILED 10
#define STR_EVENT_SAVEASDOC 11
#define STR_EVENT_SAVEASDOCDONE 12
#define STR_EVENT_SAVEASDOCFAILED 13
#define STR_EVENT_SAVETODOC 14
#define STR_EVENT_SAVETODOCDONE 15
#define STR_EVENT_SAVETODOCFAILED 16
#define STR_EVENT_ACTIVATEDOC 17
#define STR_EVENT_DEACTIVATEDOC 18
#define STR_EVENT_PRINTDOC 19
#define STR_EVENT_VIEWCREATED 20
#define STR_EVENT_PREPARECLOSEVIEW 21
#define STR_EVENT_CLOSEVIEW 22
#define STR_EVENT_MODIFYCHANGED 23
#define STR_EVENT_TITLECHANGED 24
#define STR_EVENT_VISAREACHANGED 25
#define STR_EVENT_MODECHANGED 26
#define STR_EVENT_STORAGECHANGED 27
typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventBindingHash; typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventBindingHash;
typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > FrameVector; typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > FrameVector;
typedef ::std::vector< ::rtl::OUString > SupportedEventsVector; typedef ::std::vector< ::rtl::OUString > SupportedEventsVector;
@@ -67,7 +96,7 @@ public:
::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException);
::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException);
::rtl::OUString GetEventName( sal_Int32 nID );
}; };
class SVL_DLLPUBLIC GlobalEventConfig: class SVL_DLLPUBLIC GlobalEventConfig:
@@ -86,7 +115,7 @@ class SVL_DLLPUBLIC GlobalEventConfig:
::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException);
::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException);
static ::rtl::OUString GetEventName( sal_Int32 nID );
private: private:
static GlobalEventConfig_Impl* m_pImpl; static GlobalEventConfig_Impl* m_pImpl;

88
svtools/source/config/eventcfg.cxx
View File

@@ -62,24 +62,70 @@ using namespace ::com::sun::star;
#define SETNODE_BINDINGS OUString(RTL_CONSTASCII_USTRINGPARAM("Bindings" )) #define SETNODE_BINDINGS OUString(RTL_CONSTASCII_USTRINGPARAM("Bindings" ))
#define PROPERTYNAME_BINDINGURL OUString(RTL_CONSTASCII_USTRINGPARAM("BindingURL")) #define PROPERTYNAME_BINDINGURL OUString(RTL_CONSTASCII_USTRINGPARAM("BindingURL"))
const char* pEventAsciiNames[] =
{
"OnStartApp",
"OnCloseApp",
"OnCreate",
"OnNew",
"OnLoadFinished",
"OnLoad",
"OnPrepareUnload",
"OnUnload",
"OnSave",
"OnSaveDone",
"OnSaveFailed",
"OnSaveAs",
"OnSaveAsDone",
"OnSaveAsFailed",
"OnCopyTo",
"OnCopyToDone",
"OnCopyToFailed",
"OnFocus",
"OnUnfocus",
"OnPrint",
"OnViewCreated",
"OnPrepareViewClosing",
"OnViewClosed",
"OnModifyChanged",
"OnTitleChanged",
"OnVisAreaChanged",
"OnModeChanged",
"OnStorageChanged"
};
GlobalEventConfig_Impl::GlobalEventConfig_Impl() GlobalEventConfig_Impl::GlobalEventConfig_Impl()
: ConfigItem( ROOTNODE_EVENTS, CONFIG_MODE_IMMEDIATE_UPDATE ) : ConfigItem( ROOTNODE_EVENTS, CONFIG_MODE_IMMEDIATE_UPDATE )
{ {
// the supported event names // the supported event names
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnStartApp")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_STARTAPP] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnCloseApp")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_CLOSEAPP] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnNew")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_DOCCREATED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnUnload")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_CREATEDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnPrepareUnload")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_LOADFINISHED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnLoad")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_OPENDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnSave")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_PREPARECLOSEDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnSaveAs")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_CLOSEDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnSaveDone")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVEDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnSaveAsDone")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVEDOCDONE] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnFocus")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVEDOCFAILED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnUnfocus")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVEASDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnPrint")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVEASDOCDONE] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii("OnModifyChanged")); m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVEASDOCFAILED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVETODOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVETODOCDONE] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_SAVETODOCFAILED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_ACTIVATEDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_DEACTIVATEDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_PRINTDOC] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_VIEWCREATED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_PREPARECLOSEVIEW] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_CLOSEVIEW] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_MODIFYCHANGED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_TITLECHANGED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_VISAREACHANGED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_MODECHANGED] ) );
m_supportedEvents.push_back(::rtl::OUString::createFromAscii( pEventAsciiNames[STR_EVENT_STORAGECHANGED] ) );
initBindingInfo(); initBindingInfo();
@@ -103,6 +149,14 @@ GlobalEventConfig_Impl::~GlobalEventConfig_Impl()
} }
} }
::rtl::OUString GlobalEventConfig_Impl::GetEventName( sal_Int32 nIndex )
{
if ( nIndex < (sal_Int32) m_supportedEvents.size() )
return m_supportedEvents[nIndex];
else
return rtl::OUString();
}
//***************************************************************************************************************** //*****************************************************************************************************************
// public method // public method
//***************************************************************************************************************** //*****************************************************************************************************************
@@ -396,3 +450,9 @@ Mutex& GlobalEventConfig::GetOwnStaticMutex()
// Return new created or already existing mutex object. // Return new created or already existing mutex object.
return *pMutex; return *pMutex;
} }
::rtl::OUString GlobalEventConfig::GetEventName( sal_Int32 nIndex )
{
return GlobalEventConfig().m_pImpl->GetEventName( nIndex );
}

1
tools/inc/tools/errcode.hxx
View File

@@ -314,6 +314,7 @@ inline ULONG ERRCODE_TOERROR( ULONG x )
#define PRINTER_ABORT ERRCODE_IO_ABORT #define PRINTER_ABORT ERRCODE_IO_ABORT
#define PRINTER_OUTOFMEMORY ERRCODE_IO_OUTOFMEMORY #define PRINTER_OUTOFMEMORY ERRCODE_IO_OUTOFMEMORY
#define PRINTER_GENERALERROR ERRCODE_IO_GENERAL #define PRINTER_GENERALERROR ERRCODE_IO_GENERAL
#define PRINTER_ACCESSDENIED ERRCODE_IO_ACCESSDENIED
#define ERRCODE_INET_NAME_RESOLVE (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 1) #define ERRCODE_INET_NAME_RESOLVE (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 1)
#define ERRCODE_INET_CONNECT (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 2) #define ERRCODE_INET_CONNECT (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 2)