[Libreoffice-commits] core.git: 7 commits - sc/inc sc/source sw/qa vcl/inc vcl/osx
Caolán McNamara
caolanm at redhat.com
Mon Feb 24 05:40:14 PST 2014
sc/inc/dapiuno.hxx | 30 +++++++++++++++----------
sc/source/ui/unoobj/dapiuno.cxx | 16 +++++++++----
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 4 +--
vcl/inc/osx/vclnsapp.h | 1
vcl/osx/salinst.cxx | 36 +++++++------------------------
vcl/osx/vclnsapp.mm | 18 +++++++++++++++
6 files changed, 59 insertions(+), 46 deletions(-)
New commits:
commit df2533ec4063153c06bc8b475977601517ba2cd6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 13:39:16 2014 +0000
fix MacOSX-x86_49-TDF tinderbox
Change-Id: I15632bd87be37d9bb5815c9d800271dfd4c3b016
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1ee6af8..d7692ac 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3485,8 +3485,8 @@ DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx, "embedded-xlsx.docx")
// finally check the embedded files are present in the zipped document
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), m_aTempFile.GetURL());
uno::Sequence<OUString> names = xNameAccess->getElementNames();
- sal_Int32 nSheetFiles = 0;
- sal_Int32 nImageFiles = 0;
+ int nSheetFiles = 0;
+ int nImageFiles = 0;
for (int i=0; i<names.getLength(); i++)
{
if(names[i].startsWith("word/embeddings/Microsoft_Excel_Worksheet"))
commit 2c7528552d901f855224b6a35dcc768d42ddaec6
Author: Herbert Dürr <hdu at apache.org>
Date: Mon Feb 24 09:49:19 2014 +0000
Resolves: #i119006# delay Mac initial event until the app has launched
delaying the initial event prevents complaints from OSX>=10.7's "windows
restore" feature to recur infinitely. Apparently OSX cleans things up for us
just before we get the applicationDidFinishLaunching() callback.
(cherry picked from commit 0f3712ff654c740f3593b9580f34cdfe21ac3250)
Conflicts:
vcl/osx/salinst.cxx
Change-Id: I0f1d59f03ffe4efc7c9a73fa881151fa06af5424
diff --git a/vcl/inc/osx/vclnsapp.h b/vcl/inc/osx/vclnsapp.h
index 38ad251..541b509 100644
--- a/vcl/inc/osx/vclnsapp.h
+++ b/vcl/inc/osx/vclnsapp.h
@@ -38,6 +38,7 @@ class AquaSalFrame;
@interface VCL_NSApplication : NSApplication
{
}
+-(void)applicationDidFinishLaunching:(NSNotification*)pNotification;
-(void)sendEvent:(NSEvent*)pEvent;
-(void)sendSuperEvent:(NSEvent*)pEvent;
-(NSMenu*)applicationDockMenu:(NSApplication *)sender;
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index fcec7b6..f0e6b34 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -194,37 +194,19 @@ sal_Bool ImplSVMainHook( int * pnInit )
bNoSVMain = false;
initNSApp();
- NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
- location: NSZeroPoint
- modifierFlags: 0
- timestamp: 0
- windowNumber: 0
- context: nil
- subtype: AquaSalInstance::AppExecuteSVMain
- data1: 0
- data2: 0 ];
- if( pEvent )
- {
- [NSApp postEvent: pEvent atStart: NO];
-
- OUString aExeURL, aExe;
- osl_getExecutableFile( &aExeURL.pData );
- osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData );
- OString aByteExe( OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
+ OUString aExeURL, aExe;
+ osl_getExecutableFile( &aExeURL.pData );
+ osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData );
+ OString aByteExe( OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
#ifdef DEBUG
- aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" );
- const char* pArgv[] = { aByteExe.getStr(), NULL };
- NSApplicationMain( 3, pArgv );
+ aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" );
+ const char* pArgv[] = { aByteExe.getStr(), NULL };
+ NSApplicationMain( 3, pArgv );
#else
- const char* pArgv[] = { aByteExe.getStr(), NULL };
- NSApplicationMain( 1, pArgv );
+ const char* pArgv[] = { aByteExe.getStr(), NULL };
+ NSApplicationMain( 1, pArgv );
#endif
- }
- else
- {
- OSL_FAIL( "NSApplication initialization could not be done" );
- }
return TRUE; // indicate that ImplSVMainHook is implemented
}
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index bd85aa7..531125a 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -57,6 +57,24 @@
// desktop/macosx/Info.plist has the value VCL_NSApplication.
@implementation VCL_NSApplication
+
+-(void)applicationDidFinishLaunching:(NSNotification*)pNotification
+{
+ (void)pNotification;
+
+ NSEvent* pEvent = [NSEvent otherEventWithType: NSApplicationDefined
+ location: NSZeroPoint
+ modifierFlags: 0
+ timestamp: 0
+ windowNumber: 0
+ context: nil
+ subtype: AquaSalInstance::AppExecuteSVMain
+ data1: 0
+ data2: 0 ];
+ if( pEvent )
+ [NSApp postEvent: pEvent atStart: NO];
+}
+
-(void)sendEvent:(NSEvent*)pEvent
{
NSEventType eType = [pEvent type];
commit 03bdbcb42aa3be6932d390eeaa14ee2e4d45a172
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 13:36:09 2014 +0000
coverity#737508 Uncaught exception
Change-Id: I100bd99fdbf2929214f89baac962d74cb6a530a6
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 5ba3cd6..a826bbd 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -514,8 +514,9 @@ public:
virtual OUString SAL_CALL getName()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- virtual void SAL_CALL setName( const OUString& aName )
- throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName(const OUString& aName)
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index d25ec0d..63cd500 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1865,7 +1865,8 @@ OUString SAL_CALL ScDataPilotFieldObj::getName()
return aName;
}
-void SAL_CALL ScDataPilotFieldObj::setName( const OUString& rName ) throw(RuntimeException)
+void SAL_CALL ScDataPilotFieldObj::setName(const OUString& rName)
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ScDPObject* pDPObj = 0;
commit f10e4ce1ed2dace97823c59ca8b0dca161db42aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 13:34:08 2014 +0000
coverity#737507 Uncaught exception
Change-Id: Id035849f94bfb5e6ba7f5463a6a548bf88b77e85
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 10fdb08..5ba3cd6 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -511,7 +511,9 @@ public:
virtual ~ScDataPilotFieldObj();
// XNamed
- virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 6f1b4e5..d25ec0d 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1845,7 +1845,8 @@ ScDataPilotFieldObj::~ScDataPilotFieldObj()
// XNamed
-OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException)
+OUString SAL_CALL ScDataPilotFieldObj::getName()
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aName;
commit 42d46144df4f30f8f9d5aa4c92e653005ec9f2a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 13:32:49 2014 +0000
coverity#737506 Uncaught exception
Change-Id: Ib36b9bab3f31b32b8be3d7c51af7f26280a7a069
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 45080c2..10fdb08 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -521,11 +521,12 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 890b0f9..6f1b4e5 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1888,7 +1888,9 @@ Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo()
}
void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
- throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
+ throw (UnknownPropertyException, PropertyVetoException,
+ IllegalArgumentException, WrappedTargetException,
+ RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aNameString(aPropertyName);
commit 1d250c95ddcfe6a1d3175e7fd1cc3c5271c6c1d5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 13:27:35 2014 +0000
coverity#737504 Uncaught exception
Change-Id: I3cfa8ba3baaf071e4300b12c8bbcba4c652ee309
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index f40d971..45080c2 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -528,9 +528,10 @@ public:
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
const OUString& PropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 10e677e..890b0f9 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1984,7 +1984,8 @@ void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyNa
}
Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyName )
- throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+ throw (UnknownPropertyException, WrappedTargetException,
+ RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aNameString(aPropertyName);
commit 9a8a4b81b66bcf3f1330ceb208f727e2023b36e5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 24 13:25:41 2014 +0000
coverity#737502 Uncaught exception
Change-Id: I5f5b7244db311501af6ded863b4b1fa46e5a547a
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index ec96ae7..f40d971 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -591,7 +591,8 @@ public:
virtual com::sun::star::uno::Reference < com::sun::star::sheet::XDataPilotField > SAL_CALL
createNameGroup(const com::sun::star::uno::Sequence< OUString >& aItems)
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException);
+ ::com::sun::star::lang::IllegalArgumentException,
+ std::exception);
virtual com::sun::star::uno::Reference < com::sun::star::sheet::XDataPilotField > SAL_CALL
createDateGroup(const com::sun::star::sheet::DataPilotFieldGroupInfo& rInfo)
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 36fba0c..10e677e 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -2539,7 +2539,8 @@ bool ScDataPilotFieldObj::HasString(const Sequence< OUString >& rItems, const OU
// XDataPilotFieldGrouping
Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( const Sequence< OUString >& rItems )
- throw (RuntimeException, IllegalArgumentException)
+ throw (RuntimeException, IllegalArgumentException,
+ std::exception)
{
SolarMutexGuard aGuard;
More information about the Libreoffice-commits
mailing list