[Libreoffice-commits] .: 2 commits - dtrans/Module_dtrans.mk dtrans/StaticLibrary_dtobj.mk framework/source Repository.mk
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Aug 11 06:02:44 PDT 2011
Repository.mk | 1
dtrans/Module_dtrans.mk | 1
dtrans/StaticLibrary_dtobj.mk | 12 +++++-
framework/source/uielement/toolbarmanager.cxx | 48 +++++++++++++-------------
4 files changed, 37 insertions(+), 25 deletions(-)
New commits:
commit b469afced3c2fe59dac01263c80e07783bc1d60d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 13:59:41 2011 +0100
get dtrans compiling under windows again
diff --git a/Repository.mk b/Repository.mk
index 87253d0..d57c126 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -223,6 +223,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
app \
basegfx_s \
+ dtobj \
libeay32 \
ssleay32 \
ooopathutils \
diff --git a/dtrans/Module_dtrans.mk b/dtrans/Module_dtrans.mk
index 3cd0200..c9524da 100644
--- a/dtrans/Module_dtrans.mk
+++ b/dtrans/Module_dtrans.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,dtrans,\
Library_dtrans \
Library_ftransl \
Library_sysdtrans \
+ StaticLibrary_dtobj \
))
endif
diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk
index bf69b20..194f527 100644
--- a/dtrans/StaticLibrary_dtobj.mk
+++ b/dtrans/StaticLibrary_dtobj.mk
@@ -28,6 +28,16 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,dtobj))
+$(eval $(call gb_StaticLibrary_set_include,dtobj,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/dtrans/inc/pch) \
+))
+
+$(eval $(call gb_StaticLibrary_add_api,dtobj,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\
dtrans/source/win32/dtobj/APNDataObject \
dtrans/source/win32/dtobj/DataFmtTransl \
@@ -44,7 +54,7 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\
ifneq ($(COM),GCC)
$(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\
- source/win32/dtobj/XNotifyingDataObject \
+ dtrans/source/win32/dtobj/XNotifyingDataObject \
))
endif
commit 88ad01b3edd6a16d25273cfbacac504b7c236530
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 11 13:25:51 2011 +0100
catch by const reference
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 51a8ed4..bc02e01 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -194,11 +194,11 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager
{
xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager;
}
- catch ( RuntimeException& )
+ catch (const RuntimeException&)
{
throw;
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -499,7 +499,7 @@ void ToolBarManager::UpdateControllers()
if ( xUpdatable.is() )
xUpdatable->update();
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
++pIter;
@@ -523,7 +523,7 @@ void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com::
xUpdatable->update();
}
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
@@ -578,7 +578,7 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run
Reference< XUIConfigurationListener >(
static_cast< OWeakObject* >( this ), UNO_QUERY ));
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -591,7 +591,7 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run
Reference< XUIConfigurationListener >(
static_cast< OWeakObject* >( this ), UNO_QUERY ));
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -638,7 +638,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException )
Reference< XUIConfigurationListener >(
static_cast< OWeakObject* >( this ), UNO_QUERY ));
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -651,7 +651,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException )
Reference< XUIConfigurationListener >(
static_cast< OWeakObject* >( this ), UNO_QUERY ));
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -669,7 +669,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException )
m_xFrame->removeFrameActionListener( Reference< XFrameActionListener >(
static_cast< ::cppu::OWeakObject *>( this ), UNO_QUERY ));
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -817,7 +817,7 @@ void ToolBarManager::RemoveControllers()
{
xComponent->dispose();
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -856,7 +856,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
m_xUICommandLabels->getByName( rCmdURL ) >>= aPropSeq;
}
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
@@ -1133,11 +1133,11 @@ void ToolBarManager::CreateControllers()
UpdateController(xTbxController);
}
}
- catch ( RuntimeException& )
+ catch (const RuntimeException&)
{
throw;
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -1238,7 +1238,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
if ( xModuleManager.is() )
m_aModuleIdentifier = xModuleManager->identify( Reference< XInterface >( m_xFrame, UNO_QUERY ) );
}
- catch( Exception& )
+ catch (const Exception&)
{
}
@@ -1312,7 +1312,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
}
}
- catch( Exception& )
+ catch (const Exception&)
{
}
}
@@ -1405,7 +1405,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
}
}
- catch ( ::com::sun::star::lang::IndexOutOfBoundsException& )
+ catch (const ::com::sun::star::lang::IndexOutOfBoundsException&)
{
break;
}
@@ -1496,7 +1496,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
if ( aUIName.getLength() > 0 )
m_pToolBar->SetText( aUIName );
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -1581,11 +1581,11 @@ void ToolBarManager::notifyRegisteredControllers( const rtl::OUString& aUIElemen
if ( xController.is() )
xController->functionSelected( aCommand );
}
- catch ( RuntimeException& e )
+ catch (const RuntimeException&)
{
throw;
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
@@ -2032,7 +2032,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
xUICfgMgr->store();
}
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
@@ -2193,7 +2193,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe
pExecuteInfo->xLayoutManager->dockAllWindows( UIElementType::TOOLBAR );
}
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
@@ -2231,7 +2231,7 @@ bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration(
}
}
}
- catch ( IllegalArgumentException& )
+ catch (const IllegalArgumentException&)
{
}
}
@@ -2289,11 +2289,11 @@ bool ToolBarManager::RetrieveShortcut( const rtl::OUString& rCommandURL, rtl::OU
m_xModuleAcceleratorManager = xModuleAccelCfg;
}
}
- catch ( RuntimeException& )
+ catch (const RuntimeException&)
{
throw;
}
- catch ( Exception& )
+ catch (const Exception&)
{
}
}
More information about the Libreoffice-commits
mailing list