summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-05-26 13:53:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-06-04 16:57:55 +0200
commitb3c76dee6d44d07eae404b8d7341e6c88e6c4429 (patch)
treec747dd5bddf94c3b4312c7b1861a5087e76e71d6 /cui/source
parenteb68bf18f2d859486c4a737abb2536a6afe45411 (diff)
fdo#46808, Adapt UNO services to new style, Part 7, updating ::create
Update calls to factories to use new ::create methods Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/cfg.cxx22
-rw-r--r--cui/source/dialogs/plfilter.cxx100
-rw-r--r--cui/source/tabpages/numpages.cxx10
3 files changed, 58 insertions, 74 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index f1616367812d..adaeaaa94614 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -85,7 +85,9 @@
#include <com/sun/star/frame/XFramesSupplier.hpp>
#include <com/sun/star/frame/XFrames.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/embed/FileSystemStorageFactory.hpp>
#include "dlgname.hxx"
@@ -5052,19 +5054,11 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
uno::Reference< lang::XMultiServiceFactory > xServiceManager =
::comphelper::getProcessServiceFactory();
+ uno::Reference< uno::XComponentContext > xComponentContext =
+ ::comphelper::getProcessComponentContext();
- if ( xServiceManager.is() )
- {
- m_xGraphProvider = uno::Reference< graphic::XGraphicProvider >(
- xServiceManager->createInstance(
- ::rtl::OUString("com.sun.star.graphic.GraphicProvider" ) ),
- uno::UNO_QUERY );
- }
-
- if ( !m_xGraphProvider.is() )
- {
- aBtnImport.Enable( sal_False );
- }
+ m_xGraphProvider = uno::Reference< graphic::XGraphicProvider >(
+ graphic::GraphicProvider::create( xComponentContext ) );
uno::Reference< beans::XPropertySet > xPropSet(
xServiceManager->createInstance( ::rtl::OUString("com.sun.star.util.PathSettings" ) ),
@@ -5094,9 +5088,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
aDirectory += ::rtl::OUString( "soffice.cfg/import" );
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
- xServiceManager->createInstance(
- ::rtl::OUString("com.sun.star.embed.FileSystemStorageFactory" ) ),
- uno::UNO_QUERY );
+ ::com::sun::star::embed::FileSystemStorageFactory::create( xComponentContext ) );
uno::Sequence< uno::Any > aArgs( 2 );
aArgs[ 0 ] <<= aDirectory;
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index 678db753ad3b..ff6816026c4e 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/plugin/PluginDescription.hpp>
+#include <com/sun/star/plugin/PluginManager.hpp>
#include <com/sun/star/plugin/XPluginManager.hpp>
using namespace std;
@@ -57,69 +58,62 @@ typedef map< String, StrSet, ltstr > FilterMap;
//==================================================================================================
void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequence< rtl::OUString >& rPluginTypes )
{
- Reference< XMultiServiceFactory > xMan( ::comphelper::getProcessServiceFactory() );
- Reference< XPluginManager > xPMgr( xMan->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager") ) ), UNO_QUERY );
+ Reference< XComponentContext > xContext = comphelper::getProcessComponentContext();
+ Reference< XPluginManager > xPMgr( PluginManager::create(xContext) );
- if ( xPMgr.is() )
+ FilterMap aMap;
+
+ // sum up the mimetypes: one description, multiple extensions
+
+ Sequence<PluginDescription > aDescriptions( xPMgr->getPluginDescriptions() );
+ const PluginDescription * pDescriptions = aDescriptions.getConstArray();
+ for ( sal_uInt32 nPos = aDescriptions.getLength(); nPos--; )
{
- FilterMap aMap;
+ const PluginDescription & rDescr = pDescriptions[nPos];
- // sum up the mimetypes: one description, multiple extensions
+ StrSet& rTypes = aMap[ rDescr.Description ];
+ String aExtension( rDescr.Extension );
- Sequence<PluginDescription > aDescriptions( xPMgr->getPluginDescriptions() );
- const PluginDescription * pDescriptions = aDescriptions.getConstArray();
- for ( sal_uInt32 nPos = aDescriptions.getLength(); nPos--; )
+ for ( sal_uInt16 nCnt = comphelper::string::getTokenCount(aExtension, ';'); nCnt--; )
+ {
+ // no default plugins anymore
+ String aExt( aExtension.GetToken( nCnt, ';' ) );
+ if ( aExt.CompareToAscii( "*.*" ) != COMPARE_EQUAL )
+ rTypes.insert( aExt );
+ }
+ }
+
+ rPluginNames = Sequence< rtl::OUString >( aMap.size() );
+ rPluginTypes = Sequence< rtl::OUString >( aMap.size() );
+ rtl::OUString* pPluginNames = rPluginNames.getArray();
+ rtl::OUString* pPluginTypes = rPluginTypes.getArray();
+ int nIndex = 0;
+ for ( FilterMap::iterator iPos = aMap.begin(); iPos != aMap.end(); ++iPos )
+ {
+ String aText( (*iPos).first );
+ String aType;
+ StrSet& rTypes = (*iPos).second;
+ StrSet::iterator i = rTypes.begin();
+ while ( i != rTypes.end() )
{
- const PluginDescription & rDescr = pDescriptions[nPos];
-
- StrSet& rTypes = aMap[ rDescr.Description ];
- String aExtension( rDescr.Extension );
-
- for ( sal_uInt16 nCnt = comphelper::string::getTokenCount(aExtension, ';'); nCnt--; )
- {
- // no default plugins anymore
- String aExt( aExtension.GetToken( nCnt, ';' ) );
- if ( aExt.CompareToAscii( "*.*" ) != COMPARE_EQUAL )
- rTypes.insert( aExt );
- }
+ aType += (*i);
+ ++i;
+ if ( i != rTypes.end() )
+ aType += ';';
}
- rPluginNames = Sequence< rtl::OUString >( aMap.size() );
- rPluginTypes = Sequence< rtl::OUString >( aMap.size() );
- rtl::OUString* pPluginNames = rPluginNames.getArray();
- rtl::OUString* pPluginTypes = rPluginTypes.getArray();
- int nIndex = 0;
- for ( FilterMap::iterator iPos = aMap.begin(); iPos != aMap.end(); ++iPos )
+ if ( aType.Len() )
{
- String aText( (*iPos).first );
- String aType;
- StrSet& rTypes = (*iPos).second;
- StrSet::iterator i = rTypes.begin();
- while ( i != rTypes.end() )
- {
- aType += (*i);
- ++i;
- if ( i != rTypes.end() )
- aType += ';';
- }
-
- if ( aType.Len() )
- {
- aText += String::CreateFromAscii( " (" );
- aText += aType;
- aText += ')';
- pPluginNames[nIndex] = aText;
- pPluginTypes[nIndex] = aType;
- nIndex++;
- }
+ aText += String::CreateFromAscii( " (" );
+ aText += aType;
+ aText += ')';
+ pPluginNames[nIndex] = aText;
+ pPluginTypes[nIndex] = aType;
+ nIndex++;
}
- rPluginNames.realloc( nIndex );
- rPluginTypes.realloc( nIndex );
}
- else
- ShowServiceNotAvailableError( NULL,
- String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.plugin.PluginManager" ) ), sal_True );
+ rPluginNames.realloc( nIndex );
+ rPluginTypes.realloc( nIndex );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index a4d38370874b..fc05d7293238 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -59,6 +59,7 @@
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/text/DefaultNumberingProvider.hpp>
#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
#include <com/sun/star/text/XNumberingFormatter.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -66,6 +67,7 @@
#include <com/sun/star/text/XNumberingTypeInfo.hpp>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <comphelper/componentcontext.hxx>
#include <algorithm>
#include <vector>
@@ -112,12 +114,8 @@ static const sal_Char cBulletFontName[] = "BulletFontName";
Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
{
- Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
- Reference < XInterface > xI = xMSF->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.DefaultNumberingProvider" )) );
- Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY);
- DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"");
-
+ Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
+ Reference<XDefaultNumberingProvider> xRet = text::DefaultNumberingProvider::create(xContext);
return xRet;
}