diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-20 23:59:52 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-21 07:52:25 +0100 |
| commit | 65a43d682f979bfb6189dfc4e138ad9ac34adcae (patch) | |
| tree | d9773e9100b7641693cd7373b6b1b2e9285b4a34 | |
| parent | ffaa20a1de7c34a71babc2c777e896fd02e7b98d (diff) | |
Linking globals named 'sDocCtxName': symbol multiply defined!
Change-Id: Ib199ecb02b0e0f8382fcf1702652d9ad0fcb1765
| -rw-r--r-- | sc/source/ui/vba/vbaglobals.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/vba/vbaglobals.cxx | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 813eb1c851d2..919da33f88e0 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -42,16 +42,15 @@ using namespace ::ooo::vba; // ============================================================================= //ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext, ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext ) -OUString sDocCtxName( "ExcelDocumentContext" ); -ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName ) +ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "ExcelDocumentContext" ) { OSL_TRACE("ScVbaGlobals::ScVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); aInitArgs[ 0 ].Name = "Application"; aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); - aInitArgs[ 1 ].Name = sDocCtxName; + aInitArgs[ 1 ].Name = "ExcelDocumentContext"; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); init( aInitArgs ); diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 94152662614b..6690271ac455 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -31,19 +31,17 @@ using namespace ::com::sun::star::uno; using namespace ::ooo::vba; -OUString sDocCtxName("WordDocumentContext"); - // ============================================================================= // SwVbaGlobals // ============================================================================= -SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName ) +SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" ) { OSL_TRACE("SwVbaGlobals::SwVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); aInitArgs[ 0 ].Name = "Application"; aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); - aInitArgs[ 1 ].Name = sDocCtxName; + aInitArgs[ 1 ].Name = "WordDocumentContext"; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); init( aInitArgs ); |