[Libreoffice-commits] .: 8 commits - filter/source lotuswordpro/source lotuswordpro/util sc/source sd/source svx/source sw/source xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 1 03:33:16 PDT 2012
filter/source/svg/svgfilter.component | 2 +-
filter/source/svg/svgfilter.cxx | 2 +-
filter/source/t602/filterenv.cxx | 4 ++++
filter/source/t602/t602filter.component | 2 +-
lotuswordpro/source/filter/genericfilter.cxx | 2 +-
lotuswordpro/util/lwpfilter.component | 2 +-
sc/source/ui/app/drwtrans.cxx | 2 +-
sd/source/ui/app/sdxfer.cxx | 2 +-
sd/source/ui/app/tmplctrl.cxx | 12 ++++++------
sd/source/ui/unoidl/unopage.cxx | 18 +++++++++---------
sd/source/ui/view/viewshe2.cxx | 2 ++
svx/source/unodraw/unomod.cxx | 2 +-
sw/source/ui/utlui/tmplctrl.cxx | 12 ++++++------
xmloff/source/draw/ximppage.cxx | 16 ++++++++--------
14 files changed, 43 insertions(+), 37 deletions(-)
New commits:
commit a24a6a41c60740e2ebd1df14d055f7c37af8f21b
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:30:38 2012 +0300
Deduplication of aEmptyStr for disable-dynlinking
Change-Id: I9525be3b0f238abb106b1c57549436272e1eb165
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index c1ce1e5..4c4a06a 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -85,7 +85,9 @@
using namespace com::sun::star;
+#ifndef DISABLE_DYNLOADING // otherwise use the one in sw...
const String aEmptyStr;
+#endif
namespace sd {
commit 5b14ebdda30a3900537f2bc5f5ec876f7c5d5efa
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:30:15 2012 +0300
Deduplication of ImplGetSupportedMacroItems for disable-dynlinking
Change-Id: If6fb0a2152041f65d2e4b38dfbf87491b323f28f
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 47c96c8..b07ee32 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -106,7 +106,7 @@ public:
};
//-////////////////////////////////////////////////////////////////////
-const SvEventDescription* ImplGetSupportedMacroItems()
+static const SvEventDescription* ImplGetSupportedMacroItems()
{
static const SvEventDescription aMacroDescriptionsImpl[] =
{
commit f1d9c520a2a2df5bdbb02fff7ba8f3a134dfc32d
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:29:42 2012 +0300
Deduplication of NavigationOrderAccess for disable-dynlinking
Change-Id: I70238711222a12cb6bd843ebbc742a21a325810d
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index fcdae15..614cb88 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2602,10 +2602,10 @@ void SdGenericDrawPage::setNavigationOrder( const Any& rValue )
throw IllegalArgumentException();
}
-class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
+class SdNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
{
public:
- NavigationOrderAccess( SdrPage* pPage );
+ SdNavigationOrderAccess( SdrPage* pPage );
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException);
@@ -2619,7 +2619,7 @@ private:
std::vector< Reference< XShape > > maShapes;
};
-NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage )
+SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage )
: maShapes( static_cast< sal_uInt32 >( pPage ? pPage->GetObjCount() : 0 ) )
{
if( pPage )
@@ -2630,19 +2630,19 @@ NavigationOrderAccess::NavigationOrderAccess( SdrPage* pPage )
{
SdrObject* pObj = pPage->GetObj( nIndex );
sal_uInt32 nNavPos = pObj->GetNavigationPosition();
- DBG_ASSERT( !maShapes[nNavPos].is(), "sd::NavigationOrderAccess::NavigationOrderAccess(), duplicate navigation positions from core!" );
+ DBG_ASSERT( !maShapes[nNavPos].is(), "sd::SdNavigationOrderAccess::SdNavigationOrderAccess(), duplicate navigation positions from core!" );
maShapes[nNavPos] = Reference< XShape >( pObj->getUnoShape(), UNO_QUERY );
}
}
}
// XIndexAccess
-sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException)
+sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) throw (RuntimeException)
{
return static_cast< sal_Int32 >( maShapes.size() );
}
-Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
if( (Index < 0) || (Index > getCount()) )
throw IndexOutOfBoundsException();
@@ -2651,12 +2651,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu
}
// XElementAccess
-Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException)
+Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException)
{
return XShape::static_type();
}
-sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException)
+sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException)
{
return maShapes.empty() ? sal_False : sal_True;
}
@@ -2665,7 +2665,7 @@ Any SdGenericDrawPage::getNavigationOrder()
{
if( GetPage()->HasObjectNavigationOrder() )
{
- return Any( Reference< XIndexAccess >( new NavigationOrderAccess( GetPage() ) ) );
+ return Any( Reference< XIndexAccess >( new SdNavigationOrderAccess( GetPage() ) ) );
}
else
{
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 9346e6a..7e57d11 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -563,10 +563,10 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName )
}
}
-class NavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
+class XoNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
{
public:
- NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes );
+ XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes );
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException);
@@ -580,18 +580,18 @@ private:
std::vector< Reference< XShape > > maShapes;
};
-NavigationOrderAccess::NavigationOrderAccess( std::vector< Reference< XShape > >& rShapes )
+XoNavigationOrderAccess::XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes )
{
maShapes.swap( rShapes );
}
// XIndexAccess
-sal_Int32 SAL_CALL NavigationOrderAccess::getCount( ) throw (RuntimeException)
+sal_Int32 SAL_CALL XoNavigationOrderAccess::getCount( ) throw (RuntimeException)
{
return static_cast< sal_Int32 >( maShapes.size() );
}
-Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+Any SAL_CALL XoNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
if( (Index < 0) || (Index > getCount()) )
throw IndexOutOfBoundsException();
@@ -600,12 +600,12 @@ Any SAL_CALL NavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOu
}
// XElementAccess
-Type SAL_CALL NavigationOrderAccess::getElementType( ) throw (RuntimeException)
+Type SAL_CALL XoNavigationOrderAccess::getElementType( ) throw (RuntimeException)
{
return XShape::static_type();
}
-sal_Bool SAL_CALL NavigationOrderAccess::hasElements( ) throw (RuntimeException)
+sal_Bool SAL_CALL XoNavigationOrderAccess::hasElements( ) throw (RuntimeException)
{
return maShapes.empty() ? sal_False : sal_True;
}
@@ -640,7 +640,7 @@ void SdXMLGenericPageContext::SetNavigationOrder()
}
Reference< XPropertySet > xSet( mxShapes, UNO_QUERY_THROW );
- xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new NavigationOrderAccess( aShapes ) ) ) );
+ xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ), Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) );
}
catch(const uno::Exception&)
{
commit 14d9d74717d999aae9d4ffb1e8c2e6369fef69fa
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:26:25 2012 +0300
Deduplication of lcl_HasOnlyControls for disable-dynlinking
Change-Id: I56a9da0493fdbee7bff4d342d5e29a83ce289530
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index a5137b9..a78afe7 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -281,7 +281,7 @@ ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* )
return pObj;
}
-sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
+static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
{
sal_Bool bOnlyControls = false; // default if there are no objects
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 353709c..8653fc6 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -356,7 +356,7 @@ void SdTransferable::CreateData()
// -----------------------------------------------------------------------------
-sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
+static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
{
sal_Bool bOnlyControls = sal_False; // default if there are no objects
commit abba52d57f4a49d56edf0ba0d48073933b1af50f
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:24:37 2012 +0300
Prefixify t602filter
Change-Id: I652ffdf009f6078c723a0f0932256adb183e7513
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index a804632..1963ddb 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -44,6 +44,10 @@ using namespace T602ImportFilter;
extern "C"
{
+#ifdef DISABLE_DYNLOADING
+#define component_getFactory t602filter_component_getFactory
+#endif
+
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
diff --git a/filter/source/t602/t602filter.component b/filter/source/t602/t602filter.component
index fe512bf..cb36327 100644
--- a/filter/source/t602/t602filter.component
+++ b/filter/source/t602/t602filter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="t602filter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.T602ImportFilter">
<service name="com.sun.star.document.ExtendedTypeDetection"/>
commit 88dd328e140b4f72eb9972e52b9fd05a5b856edb
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:24:22 2012 +0300
Prefixify svgfilter
Change-Id: Ifd34a186cd25bafbfd49dad8a1d5bd30756d83d3
diff --git a/filter/source/svg/svgfilter.component b/filter/source/svg/svgfilter.component
index c4d5bff..f99b514 100644
--- a/filter/source/svg/svgfilter.component
+++ b/filter/source/svg/svgfilter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svgfilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Draw.SVGFilter">
<service name="com.sun.star.document.ImportFilter"/>
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 0187a90..ea25cdd 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -302,7 +302,7 @@ namespace sdecl = comphelper::service_decl;
"com.sun.star.document.ExtendedTypeDetection" );
// The C shared lib entry points
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL svgfilter_component_getFactory(
sal_Char const* pImplName,
::com::sun::star::lang::XMultiServiceFactory* pServiceManager,
::com::sun::star::registry::XRegistryKey* pRegistryKey )
commit eef8ae7c3f52027476ca440586c0f65b6a174b78
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:22:51 2012 +0300
Prefixify lotuswordpro
Change-Id: I9b30477d94995adef51a76bdf298d1815f511e9e
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index 1a37472..8708ae2 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -16,7 +16,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL lotuswordpro_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/lotuswordpro/util/lwpfilter.component b/lotuswordpro/util/lwpfilter.component
index 030c759..4989843 100644
--- a/lotuswordpro/util/lwpfilter.component
+++ b/lotuswordpro/util/lwpfilter.component
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="lotuswordpro"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.LotusWordProImportFilter">
<service name="com.sun.star.document.ImportFilter"/>
commit 69222d71221d0ec81a3dbf01789456bcf2dde0da
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Oct 1 11:06:53 2012 +0300
Deduplication of TemplatePopup_Impl for disable-dynlinking
Change-Id: I3e49ab8bd3411be8fcfa7ab43b50cbb2d82b6de0
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 3978631..63abbc5 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -31,12 +31,12 @@
SFX_IMPL_STATUSBAR_CONTROL( SdTemplateControl, SfxStringItem );
-// class TemplatePopup_Impl --------------------------------------------------
+// class SdTemplatePopup_Impl --------------------------------------------------
-class TemplatePopup_Impl : public PopupMenu
+class SdTemplatePopup_Impl : public PopupMenu
{
public:
- TemplatePopup_Impl();
+ SdTemplatePopup_Impl();
sal_uInt16 GetCurId() const { return nCurId; }
@@ -48,7 +48,7 @@ private:
// -----------------------------------------------------------------------
-TemplatePopup_Impl::TemplatePopup_Impl() :
+SdTemplatePopup_Impl::SdTemplatePopup_Impl() :
PopupMenu(),
nCurId(USHRT_MAX)
{
@@ -56,7 +56,7 @@ TemplatePopup_Impl::TemplatePopup_Impl() :
// -----------------------------------------------------------------------
-void TemplatePopup_Impl::Select()
+void SdTemplatePopup_Impl::Select()
{
nCurId = GetCurItemId();
}
@@ -114,7 +114,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
return;
CaptureMouse();
- TemplatePopup_Impl aPop;
+ SdTemplatePopup_Impl aPop;
{
const sal_uInt16 nMasterCount = pDoc->GetMasterSdPageCount(PK_STANDARD);
diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx
index b43d9c6..fba6dd7 100644
--- a/sw/source/ui/utlui/tmplctrl.cxx
+++ b/sw/source/ui/utlui/tmplctrl.cxx
@@ -36,12 +36,12 @@
SFX_IMPL_STATUSBAR_CONTROL( SwTemplateControl, SfxStringItem );
-// class TemplatePopup_Impl --------------------------------------------------
+// class SwTemplatePopup_Impl --------------------------------------------------
-class TemplatePopup_Impl : public PopupMenu
+class SwTemplatePopup_Impl : public PopupMenu
{
public:
- TemplatePopup_Impl();
+ SwTemplatePopup_Impl();
sal_uInt16 GetCurId() const { return nCurId; }
@@ -51,13 +51,13 @@ private:
virtual void Select();
};
-TemplatePopup_Impl::TemplatePopup_Impl() :
+SwTemplatePopup_Impl::SwTemplatePopup_Impl() :
PopupMenu(),
nCurId(USHRT_MAX)
{
}
-void TemplatePopup_Impl::Select()
+void SwTemplatePopup_Impl::Select()
{
nCurId = GetCurItemId();
}
@@ -98,7 +98,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
GetStatusBar().GetItemText( GetId() ).Len() )
{
CaptureMouse();
- TemplatePopup_Impl aPop;
+ SwTemplatePopup_Impl aPop;
{
SwView* pView = ::GetActiveView();
SwWrtShell* pWrtShell;
More information about the Libreoffice-commits
mailing list