[Libreoffice-commits] core.git: 7 commits - accessibility/source basctl/source basic/source chart2/source comphelper/source connectivity/source dbaccess/source desktop/source extensions/source filter/source forms/source framework/source reportdesign/source sd/source sd/workben sfx2/inc sfx2/source sfx2/workben starmath/source svtools/source svx/source toolkit/source ucb/source unotools/source uui/source
Thomas Arnhold
thomas at arnhold.org
Mon Apr 1 13:46:13 PDT 2013
accessibility/source/extended/AccessibleToolPanelDeck.cxx | 3
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx | 2
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 2
basctl/source/basicide/doceventnotifier.cxx | 3
basctl/source/basicide/docsignature.cxx | 2
basctl/source/basicide/documentenumeration.cxx | 3
basctl/source/basicide/scriptdocument.cxx | 2
basctl/source/basicide/unomodel.cxx | 4
basctl/source/basicide/unomodel.hxx | 6
basic/source/basmgr/basicmanagerrepository.cxx | 2
chart2/source/controller/main/ChartModelClone.cxx | 2
chart2/source/controller/main/UndoActions.cxx | 3
chart2/source/model/main/UndoManager.cxx | 2
comphelper/source/container/enumerablemap.cxx | 2
comphelper/source/misc/anycompare.cxx | 2
comphelper/source/misc/componentbase.cxx | 2
comphelper/source/misc/componentcontext.cxx | 2
comphelper/source/misc/componentmodule.cxx | 2
comphelper/source/misc/documentinfo.cxx | 2
comphelper/source/misc/logging.cxx | 3
comphelper/source/misc/namedvaluecollection.cxx | 2
comphelper/source/misc/officeresourcebundle.cxx | 2
comphelper/source/property/property.cxx | 3
comphelper/source/property/propertybag.cxx | 3
connectivity/source/commontools/dbmetadata.cxx | 3
connectivity/source/commontools/formattedcolumnvalue.cxx | 3
connectivity/source/commontools/paramwrapper.cxx | 3
connectivity/source/commontools/predicateinput.cxx | 3
connectivity/source/commontools/sqlerror.cxx | 2
connectivity/source/commontools/statementcomposer.cxx | 3
connectivity/source/drivers/hsqldb/HConnection.cxx | 3
connectivity/source/drivers/hsqldb/HTools.cxx | 5
connectivity/source/drivers/hsqldb/HView.cxx | 2
connectivity/source/drivers/jdbc/ConnectionLog.cxx | 4
connectivity/source/drivers/jdbc/ContextClassLoader.cxx | 2
connectivity/source/resource/sharedresources.cxx | 2
dbaccess/source/core/api/View.cxx | 2
dbaccess/source/core/api/columnsettings.cxx | 3
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 2
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 2
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 3
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 3
dbaccess/source/core/dataaccess/documentevents.cxx | 2
dbaccess/source/core/misc/ContainerListener.cxx | 2
dbaccess/source/core/misc/objectnameapproval.cxx | 2
dbaccess/source/core/misc/veto.cxx | 2
dbaccess/source/core/recovery/dbdocrecovery.cxx | 2
dbaccess/source/core/recovery/settingsimport.cxx | 2
dbaccess/source/core/recovery/storagestream.cxx | 3
dbaccess/source/core/recovery/storagetextstream.cxx | 2
dbaccess/source/core/recovery/storagexmlstream.cxx | 2
dbaccess/source/core/recovery/subcomponentloader.cxx | 2
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 2
dbaccess/source/ext/macromigration/docinteraction.cxx | 2
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 2
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 2
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 2
dbaccess/source/ext/macromigration/migrationengine.cxx | 3
dbaccess/source/ext/macromigration/migrationlog.cxx | 5
dbaccess/source/ext/macromigration/progresscapture.cxx | 2
dbaccess/source/ext/macromigration/progressmixer.cxx | 5
dbaccess/source/sdbtools/connection/connectiontools.cxx | 2
dbaccess/source/sdbtools/connection/datasourcemetadata.cxx | 2
dbaccess/source/sdbtools/connection/objectnames.cxx | 2
dbaccess/source/sdbtools/connection/tablename.cxx | 2
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 2
dbaccess/source/ui/app/AppControllerGen.cxx | 2
dbaccess/source/ui/app/subcomponentmanager.cxx | 2
dbaccess/source/ui/control/charsetlistbox.cxx | 5
dbaccess/source/ui/dlg/advancedsettings.cxx | 2
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 5
dbaccess/source/ui/misc/asyncmodaldialog.cxx | 2
dbaccess/source/ui/misc/controllerframe.cxx | 2
dbaccess/source/ui/misc/dbaundomanager.cxx | 2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2
dbaccess/source/ui/misc/dsmeta.cxx | 2
dbaccess/source/ui/misc/imageprovider.cxx | 3
dbaccess/source/ui/misc/propertystorage.cxx | 2
dbaccess/source/ui/misc/singledoccontroller.cxx | 2
dbaccess/source/ui/uno/copytablewizard.cxx | 3
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 3
desktop/source/migration/migration_impl.hxx | 31
extensions/source/logging/consolehandler.cxx | 3
extensions/source/logging/csvformatter.cxx | 2
extensions/source/logging/filehandler.cxx | 2
extensions/source/logging/logger.cxx | 3
extensions/source/logging/loggerconfig.cxx | 3
extensions/source/logging/loghandler.cxx | 3
extensions/source/logging/logrecord.cxx | 2
extensions/source/logging/plaintextformatter.cxx | 2
extensions/source/propctrlr/browserline.cxx | 2
extensions/source/propctrlr/browserlistbox.cxx | 3
extensions/source/propctrlr/commoncontrol.cxx | 2
extensions/source/propctrlr/composeduiupdate.cxx | 2
extensions/source/propctrlr/defaultforminspection.cxx | 2
extensions/source/propctrlr/defaulthelpprovider.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 3
extensions/source/propctrlr/formcontroller.cxx | 2
extensions/source/propctrlr/formgeometryhandler.cxx | 3
extensions/source/propctrlr/inspectorhelpwindow.cxx | 5
extensions/source/propctrlr/inspectormodelbase.cxx | 3
extensions/source/propctrlr/objectinspectormodel.cxx | 2
extensions/source/propctrlr/pcrcomponentcontext.cxx | 2
extensions/source/propctrlr/propertycontrolextender.cxx | 3
extensions/source/propctrlr/propertyeditor.cxx | 2
extensions/source/propctrlr/propeventtranslation.cxx | 2
extensions/source/propctrlr/sqlcommanddesign.cxx | 3
extensions/source/propctrlr/usercontrol.cxx | 3
extensions/source/scanner/sane.hxx | 10
extensions/source/scanner/scanner.cxx | 16
extensions/source/scanner/scanner.hxx | 25
extensions/source/scanner/scanunx.cxx | 62
extensions/source/scanner/scanwin.cxx | 14
extensions/source/scanner/scnserv.cxx | 4
filter/source/svg/svgwriter.hxx | 9
forms/source/component/Pattern.cxx | 3
forms/source/component/cachedrowset.cxx | 3
forms/source/component/propertybaghelper.cxx | 3
forms/source/helper/commanddescriptionprovider.cxx | 2
forms/source/helper/commandimageprovider.cxx | 3
forms/source/helper/resettable.cxx | 2
forms/source/helper/windowstateguard.cxx | 2
forms/source/misc/componenttools.cxx | 2
forms/source/runtime/formoperations.cxx | 4
forms/source/xforms/submission/serialization_app_xml.cxx | 4
framework/source/fwe/helper/documentundoguard.cxx | 2
framework/source/fwe/helper/undomanagerhelper.cxx | 2
reportdesign/source/core/misc/conditionalexpression.cxx | 5
reportdesign/source/core/misc/conditionupdater.cxx | 2
reportdesign/source/core/misc/reportformula.cxx | 2
reportdesign/source/core/sdr/formatnormalizer.cxx | 2
reportdesign/source/ui/dlg/CondFormat.cxx | 3
reportdesign/source/ui/inspection/DefaultInspection.cxx | 4
sd/source/ui/toolpanel/ToolPanel.cxx | 2
sd/source/ui/toolpanel/ToolPanelFactory.cxx | 2
sd/source/ui/toolpanel/ToolPanelUIElement.cxx | 3
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2
sd/workben/custompanel/ctp_panel.cxx | 3
sfx2/inc/sfx2/sfxbasemodel.hxx | 648 ++----
sfx2/source/dialog/taskpane.cxx | 3
sfx2/source/doc/docmacromode.cxx | 3
sfx2/source/doc/docstoragemodifylistener.cxx | 2
sfx2/source/doc/docundomanager.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 1028 +++++-----
sfx2/source/doc/sfxmodelfactory.cxx | 2
sfx2/source/view/frmload.cxx | 2
sfx2/source/view/userinputinterception.cxx | 3
sfx2/workben/custompanel/ctp_factory.cxx | 2
sfx2/workben/custompanel/ctp_panel.cxx | 3
sfx2/workben/custompanel/ctp_services.cxx | 2
starmath/source/smdetect.cxx | 61
starmath/source/smdetect.hxx | 10
svtools/source/table/cellvalueconversion.cxx | 3
svtools/source/table/gridtablerenderer.cxx | 2
svtools/source/table/tablecontrol_impl.cxx | 3
svtools/source/table/tabledatawindow.cxx | 2
svtools/source/toolpanel/drawerlayouter.cxx | 2
svtools/source/toolpanel/paneltabbarpeer.cxx | 2
svtools/source/toolpanel/toolpaneldeck.cxx | 3
svtools/source/toolpanel/toolpaneldeckpeer.cxx | 2
svtools/source/toolpanel/toolpaneldrawerpeer.cxx | 3
svtools/source/uno/svtxgridcontrol.cxx | 2
svtools/source/uno/unocontroltablemodel.cxx | 2
svtools/source/uno/unogridcolumnfacade.cxx | 2
svtools/source/uno/wizard/unowizard.cxx | 3
svtools/source/uno/wizard/wizardpagecontroller.cxx | 3
svtools/source/uno/wizard/wizardshell.cxx | 3
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 73
svx/source/customshapes/EnhancedCustomShapeEngine.hxx | 58
svx/source/form/databaselocationinput.cxx | 3
svx/source/form/filtnav.cxx | 2
svx/source/form/fmcontrollayout.cxx | 3
svx/source/form/fmscriptingenv.cxx | 2
svx/source/form/fmvwimp.cxx | 3
svx/source/form/formcontrolfactory.cxx | 3
svx/source/form/formcontroller.cxx | 3
svx/source/form/formcontrolling.cxx | 3
svx/source/form/formdispatchinterceptor.cxx | 2
svx/source/form/legacyformcontroller.cxx | 2
svx/source/form/stringlistresource.cxx | 5
svx/source/sdr/contact/viewcontactofunocontrol.cxx | 2
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2
svx/source/unodraw/shapepropertynotifier.cxx | 2
svx/source/unodraw/unoctabl.cxx | 2
toolkit/source/awt/animatedimagespeer.cxx | 3
toolkit/source/awt/stylesettings.cxx | 2
toolkit/source/controls/animatedimages.cxx | 3
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 2
toolkit/source/controls/grid/defaultgriddatamodel.cxx | 2
toolkit/source/controls/grid/grideventforwarder.cxx | 2
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2
toolkit/source/controls/spinningprogress.cxx | 2
ucb/source/sorter/sortdynres.cxx | 2
ucb/source/sorter/sortdynres.hxx | 112 -
ucb/source/sorter/sortresult.cxx | 2
ucb/source/sorter/sortresult.hxx | 288 +-
ucb/source/ucp/ext/ucpext_content.cxx | 3
ucb/source/ucp/ext/ucpext_datasupplier.cxx | 3
ucb/source/ucp/ext/ucpext_provider.cxx | 2
ucb/source/ucp/ext/ucpext_resultset.cxx | 2
ucb/source/ucp/ext/ucpext_services.cxx | 2
unotools/source/misc/closeveto.cxx | 2
uui/source/iahndl.cxx | 2
204 files changed, 1228 insertions(+), 1695 deletions(-)
New commits:
commit 2819dd2ac1de70ce9187eee916ea12567c649d56
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Apr 1 22:41:53 2013 +0200
starmath: cleanup macros
Change-Id: I08a7d6d39302b370a5c40645fbc3494e6a9af118
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 9686942..e6a2ef8 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -66,9 +66,8 @@ using namespace ::com::sun::star::task;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
-using namespace ::rtl;
-SmFilterDetect::SmFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& /*xFactory*/ )
+SmFilterDetect::SmFilterDetect( const Reference < XMultiServiceFactory >& /*xFactory*/ )
{
}
@@ -76,17 +75,17 @@ SmFilterDetect::~SmFilterDetect()
{
}
-::rtl::OUString SAL_CALL SmFilterDetect::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException )
+OUString SAL_CALL SmFilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException )
{
- REFERENCE< XInputStream > xStream;
- REFERENCE< XContent > xContent;
- REFERENCE< XInteractionHandler > xInteraction;
+ Reference< XInputStream > xStream;
+ Reference< XContent > xContent;
+ Reference< XInteractionHandler > xInteraction;
String aURL;
- ::rtl::OUString sTemp;
+ OUString sTemp;
String aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection)
String aPreselectedFilterName; // a name describing the filter to use (from MediaDescriptor, usually from UI action)
- ::rtl::OUString aDocumentTitle; // interesting only if set in this method
+ OUString aDocumentTitle; // interesting only if set in this method
// opening as template is done when a parameter tells to do so and a template filter can be detected
// (otherwise no valid filter would be found) or if the detected filter is a template filter and
@@ -159,12 +158,12 @@ SmFilterDetect::~SmFilterDetect()
bWasReadOnly = pItem && pItem->GetValue();
String aFilterName;
- String aPrefix = rtl::OUString( "private:factory/" );
+ String aPrefix = OUString( "private:factory/" );
if( aURL.Match( aPrefix ) == aPrefix.Len() )
{
const SfxFilter* pFilter = 0;
String aPattern( aPrefix );
- aPattern += rtl::OUString("smath");
+ aPattern += OUString("smath");
if ( aURL.Match( aPattern ) >= aPattern.Len() )
{
pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
@@ -190,7 +189,7 @@ SmFilterDetect::~SmFilterDetect()
if ( bIsStorage )
{
//TODO/LATER: factor this out!
- uno::Reference < embed::XStorage > xStorage = aMedium.GetStorage( sal_False );
+ Reference < embed::XStorage > xStorage = aMedium.GetStorage( sal_False );
if ( aMedium.GetLastStorageCreationState() != ERRCODE_NONE )
{
// error during storage creation means _here_ that the medium
@@ -203,11 +202,11 @@ SmFilterDetect::~SmFilterDetect()
try
{
InteractiveAppException xException( empty,
- REFERENCE< XInterface >(),
+ Reference< XInterface >(),
InteractionClassification_ERROR,
aMedium.GetError() );
- REFERENCE< XInteractionRequest > xRequest(
+ Reference< XInteractionRequest > xRequest(
new ucbhelper::SimpleInteractionRequest( makeAny( xException ),
ucbhelper::CONTINUATION_APPROVE ) );
xInteraction->handle( xRequest );
@@ -223,13 +222,13 @@ SmFilterDetect::~SmFilterDetect()
{
const SfxFilter* pFilter = aPreselectedFilterName.Len() ?
SfxFilterMatcher().GetFilter4FilterName( aPreselectedFilterName ) : aTypeName.Len() ?
- SfxFilterMatcher(rtl::OUString("smath")).GetFilter4EA( aTypeName ) : 0;
+ SfxFilterMatcher(OUString("smath")).GetFilter4EA( aTypeName ) : 0;
OUString aTmpFilterName;
if ( pFilter )
aTmpFilterName = pFilter->GetName();
aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsAllowedAsTemplate() : sal_False, &aTmpFilterName );
}
- catch( const lang::WrappedTargetException& aWrap )
+ catch( const WrappedTargetException& aWrap )
{
packages::zip::ZipIOException aZipException;
@@ -264,11 +263,11 @@ SmFilterDetect::~SmFilterDetect()
aTypeName.Erase();
}
}
- catch( uno::RuntimeException& )
+ catch( RuntimeException& )
{
throw;
}
- catch( uno::Exception& )
+ catch( Exception& )
{
aTypeName.Erase();
}
@@ -276,7 +275,7 @@ SmFilterDetect::~SmFilterDetect()
if ( aTypeName.Len() )
{
const SfxFilter* pFilter =
- SfxFilterMatcher( rtl::OUString("smath") ).GetFilter4EA( aTypeName );
+ SfxFilterMatcher( OUString("smath") ).GetFilter4EA( aTypeName );
if ( pFilter )
aFilterName = pFilter->GetName();
}
@@ -294,7 +293,7 @@ SmFilterDetect::~SmFilterDetect()
SotStorageRef aStorage = new SotStorage ( pStrm, sal_False );
if ( !aStorage->GetError() )
{
- if (aStorage->IsStream(rtl::OUString("Equation Native")))
+ if (aStorage->IsStream(OUString("Equation Native")))
{
sal_uInt8 nVersion;
if (GetMathTypeVersion( aStorage, nVersion ) && nVersion <=3)
@@ -332,7 +331,7 @@ SmFilterDetect::~SmFilterDetect()
if ( aTypeName.Len() )
{
- const SfxFilter* pFilt = SfxFilterMatcher( rtl::OUString("smath") ).GetFilter4EA( aTypeName );
+ const SfxFilter* pFilt = SfxFilterMatcher( OUString("smath") ).GetFilter4EA( aTypeName );
if ( pFilt )
aFilterName = pFilt->GetName();
}
@@ -418,16 +417,16 @@ SmFilterDetect::~SmFilterDetect()
}
/* XServiceInfo */
-rtl::OUString SAL_CALL SmFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
+OUString SAL_CALL SmFilterDetect::getImplementationName() throw( RuntimeException )
{
return impl_getStaticImplementationName();
}
\
/* XServiceInfo */
-sal_Bool SAL_CALL SmFilterDetect::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION )
+sal_Bool SAL_CALL SmFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException )
{
- UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
- const rtl::OUString* pArray = seqServiceNames.getConstArray();
+ Sequence< OUString > seqServiceNames = getSupportedServiceNames();
+ const OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{
if ( pArray[nCounter] == sServiceName )
@@ -439,29 +438,29 @@ sal_Bool SAL_CALL SmFilterDetect::supportsService( const rtl::OUString& sService
}
/* XServiceInfo */
-UNOSEQUENCE< rtl::OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
+Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( RuntimeException )
{
return impl_getStaticSupportedServiceNames();
}
/* Helper for XServiceInfo */
-UNOSEQUENCE< rtl::OUString > SmFilterDetect::impl_getStaticSupportedServiceNames()
+Sequence< OUString > SmFilterDetect::impl_getStaticSupportedServiceNames()
{
- UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 );
+ Sequence< OUString > seqServiceNames( 1 );
seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection";
return seqServiceNames ;
}
/* Helper for XServiceInfo */
-rtl::OUString SmFilterDetect::impl_getStaticImplementationName()
+OUString SmFilterDetect::impl_getStaticImplementationName()
{
- return rtl::OUString("com.sun.star.comp.math.FormatDetector");
+ return OUString("com.sun.star.comp.math.FormatDetector");
}
/* Helper for registry */
-UNOREFERENCE< UNOXINTERFACE > SAL_CALL SmFilterDetect::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION )
+Reference< XInterface > SAL_CALL SmFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception )
{
- return UNOREFERENCE< UNOXINTERFACE >( *new SmFilterDetect( xServiceManager ) );
+ return Reference< XInterface >( *new SmFilterDetect( xServiceManager ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index d79dc9e..0cc0a7d 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -51,14 +51,10 @@ namespace com
#include <sfx2/sfxuno.hxx>
-#define REFERENCE ::com::sun::star::uno::Reference
-#define SEQUENCE ::com::sun::star::uno::Sequence
-#define RUNTIME_EXCEPTION ::com::sun::star::uno::RuntimeException
-
-class SmFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
+class SmFilterDetect : public ::cppu::WeakImplHelper2< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
{
public:
- SmFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+ SmFilterDetect( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
virtual ~SmFilterDetect();
SFX_DECL_XSERVICEINFO_NOFACTORY
@@ -66,7 +62,7 @@ public:
//----------------------------------------------------------------------------------
// XExtendedFilterDetect
//----------------------------------------------------------------------------------
- virtual ::rtl::OUString SAL_CALL detect( SEQUENCE< ::com::sun::star::beans::PropertyValue >& lDescriptor ) throw( RUNTIME_EXCEPTION );
+ virtual ::rtl::OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException );
};
#endif
commit 04008c27303a079c01db7fdc3bb110b09d3c8026
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Apr 1 22:27:46 2013 +0200
remove macros in ucb
Change-Id: I9921d79df1eeeb06c0163c1e61e0c845308c6ff9
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 4f98f04..a3bc61e 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -528,7 +528,7 @@ SortedDynamicResultSetFactory::createSortedDynamicResultSet(
void EventList::Clear()
{
- for ( std::deque< LISTACTION* >::size_type i = 0;
+ for ( std::deque< ListAction* >::size_type i = 0;
i < maData.size(); ++i )
{
delete maData[i];
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index 6ba2a77..15add7c 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -41,20 +41,6 @@ namespace cppu {
//-----------------------------------------------------------------------------
-#define NUMBERED_SORTINGINFO com::sun::star::ucb::NumberedSortingInfo
-#define RUNTIMEEXCEPTION com::sun::star::uno::RuntimeException
-#define REFERENCE com::sun::star::uno::Reference
-#define SEQUENCE com::sun::star::uno::Sequence
-#define EVENTOBJECT com::sun::star::lang::EventObject
-#define XEVENTLISTENER com::sun::star::lang::XEventListener
-#define XCOMPONENTCONTEXT com::sun::star::uno::XComponentContext
-#define XRESULTSET com::sun::star::sdbc::XResultSet
-#define SQLEXCEPTION com::sun::star::sdbc::SQLException
-#define XANYCOMPAREFACTORY com::sun::star::ucb::XAnyCompareFactory
-#define XDYNAMICRESULTSET com::sun::star::ucb::XDynamicResultSet
-#define XDYNAMICRESULTSETLISTENER com::sun::star::ucb::XDynamicResultSetListener
-#define LISTENERALREADYSETEXCEPTION com::sun::star::ucb::ListenerAlreadySetException
-
#define DYNAMIC_RESULTSET_SERVICE_NAME "com.sun.star.ucb.SortedDynamicResultSet"
#define DYNAMIC_RESULTSET_FACTORY_NAME "com.sun.star.ucb.SortedDynamicResultSetFactory"
@@ -63,21 +49,21 @@ class SortedDynamicResultSetListener;
class SortedDynamicResultSet:
public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::lang::XServiceInfo,
- public com::sun::star::ucb::XDynamicResultSet
+ public css::lang::XTypeProvider,
+ public css::lang::XServiceInfo,
+ public css::ucb::XDynamicResultSet
{
cppu::OInterfaceContainerHelper *mpDisposeEventListeners;
- REFERENCE < XDYNAMICRESULTSETLISTENER > mxListener;
- REFERENCE < XDYNAMICRESULTSETLISTENER > mxOwnListener;
+ css::uno::Reference < css::ucb::XDynamicResultSetListener > mxListener;
+ css::uno::Reference < css::ucb::XDynamicResultSetListener > mxOwnListener;
- REFERENCE < XRESULTSET > mxOne;
- REFERENCE < XRESULTSET > mxTwo;
- REFERENCE < XDYNAMICRESULTSET > mxOriginal;
- SEQUENCE < NUMBERED_SORTINGINFO > maOptions;
- REFERENCE < XANYCOMPAREFACTORY > mxCompFac;
- REFERENCE < XCOMPONENTCONTEXT > m_xContext;
+ css::uno::Reference < css::sdbc::XResultSet > mxOne;
+ css::uno::Reference < css::sdbc::XResultSet > mxTwo;
+ css::uno::Reference < css::ucb::XDynamicResultSet > mxOriginal;
+ css::uno::Sequence < css::ucb::NumberedSortingInfo > maOptions;
+ css::uno::Reference < css::ucb::XAnyCompareFactory > mxCompFac;
+ css::uno::Reference < css::uno::XComponentContext > m_xContext;
SortedResultSet* mpOne;
SortedResultSet* mpTwo;
@@ -94,10 +80,10 @@ private:
void SendNotify();
public:
- SortedDynamicResultSet( const REFERENCE < XDYNAMICRESULTSET > &xOriginal,
- const SEQUENCE < NUMBERED_SORTINGINFO > &aOptions,
- const REFERENCE < XANYCOMPAREFACTORY > &xCompFac,
- const REFERENCE < XCOMPONENTCONTEXT > &rxContext );
+ SortedDynamicResultSet( const css::uno::Reference < css::ucb::XDynamicResultSet > &xOriginal,
+ const css::uno::Sequence < css::ucb::NumberedSortingInfo > &aOptions,
+ const css::uno::Reference < css::ucb::XAnyCompareFactory > &xCompFac,
+ const css::uno::Reference < css::uno::XComponentContext > &rxContext );
~SortedDynamicResultSet();
@@ -120,55 +106,55 @@ public:
// XComponent
//-----------------------------------------------------------------
virtual void SAL_CALL
- dispose() throw( RUNTIME_EXCEPTION );
+ dispose() throw( css::uno::RuntimeException );
virtual void SAL_CALL
- addEventListener( const REFERENCE< XEVENTLISTENER >& Listener )
- throw( RUNTIME_EXCEPTION );
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
+ throw( css::uno::RuntimeException );
virtual void SAL_CALL
- removeEventListener( const REFERENCE< XEVENTLISTENER >& Listener )
- throw( RUNTIME_EXCEPTION );
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
+ throw( css::uno::RuntimeException );
//-----------------------------------------------------------------
// XDynamicResultSet
//-----------------------------------------------------------------
- virtual REFERENCE< XRESULTSET > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
getStaticResultSet( )
- throw( LISTENERALREADYSETEXCEPTION, RUNTIMEEXCEPTION );
+ throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException );
virtual void SAL_CALL
- setListener( const REFERENCE< XDYNAMICRESULTSETLISTENER >& Listener )
- throw( LISTENERALREADYSETEXCEPTION, RUNTIMEEXCEPTION );
+ setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener )
+ throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException );
virtual void SAL_CALL
- connectToCache( const REFERENCE< XDYNAMICRESULTSET > & xCache )
- throw( LISTENERALREADYSETEXCEPTION,
- com::sun::star::ucb::AlreadyInitializedException,
- com::sun::star::ucb::ServiceNotFoundException,
- RUNTIMEEXCEPTION );
+ connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache )
+ throw( css::ucb::ListenerAlreadySetException,
+ css::ucb::AlreadyInitializedException,
+ css::ucb::ServiceNotFoundException,
+ css::uno::RuntimeException );
virtual sal_Int16 SAL_CALL
getCapabilities()
- throw( RUNTIMEEXCEPTION );
+ throw( css::uno::RuntimeException );
//-----------------------------------------------------------------
// own methods:
//-----------------------------------------------------------------
virtual void SAL_CALL
- impl_disposing( const EVENTOBJECT& Source )
- throw( RUNTIMEEXCEPTION );
+ impl_disposing( const css::lang::EventObject& Source )
+ throw( css::uno::RuntimeException );
virtual void SAL_CALL
- impl_notify( const ::com::sun::star::ucb::ListEvent& Changes )
- throw( RUNTIMEEXCEPTION );
+ impl_notify( const ::css::ucb::ListEvent& Changes )
+ throw( css::uno::RuntimeException );
};
//-----------------------------------------------------------------------------
class SortedDynamicResultSetListener:
public cppu::OWeakObject,
- public com::sun::star::ucb::XDynamicResultSetListener
+ public css::ucb::XDynamicResultSetListener
{
SortedDynamicResultSet *mpOwner;
osl::Mutex maMutex;
@@ -186,15 +172,15 @@ public:
// XEventListener ( base of XDynamicResultSetListener )
//-----------------------------------------------------------------
virtual void SAL_CALL
- disposing( const EVENTOBJECT& Source )
- throw( RUNTIMEEXCEPTION );
+ disposing( const css::lang::EventObject& Source )
+ throw( css::uno::RuntimeException );
//-----------------------------------------------------------------
// XDynamicResultSetListener
//-----------------------------------------------------------------
virtual void SAL_CALL
- notify( const ::com::sun::star::ucb::ListEvent& Changes )
- throw( RUNTIMEEXCEPTION );
+ notify( const ::css::ucb::ListEvent& Changes )
+ throw( css::uno::RuntimeException );
//-----------------------------------------------------------------
// own methods:
@@ -206,17 +192,17 @@ public:
class SortedDynamicResultSetFactory:
public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::lang::XServiceInfo,
- public com::sun::star::ucb::XSortedDynamicResultSetFactory
+ public css::lang::XTypeProvider,
+ public css::lang::XServiceInfo,
+ public css::ucb::XSortedDynamicResultSetFactory
{
- REFERENCE< XCOMPONENTCONTEXT > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
SortedDynamicResultSetFactory(
- const REFERENCE< XCOMPONENTCONTEXT > & rxContext);
+ const css::uno::Reference< css::uno::XComponentContext > & rxContext);
~SortedDynamicResultSetFactory();
@@ -238,12 +224,12 @@ public:
//-----------------------------------------------------------------
// XSortedDynamicResultSetFactory
- virtual REFERENCE< XDYNAMICRESULTSET > SAL_CALL
+ virtual css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL
createSortedDynamicResultSet(
- const REFERENCE< XDYNAMICRESULTSET > & Source,
- const SEQUENCE< NUMBERED_SORTINGINFO > & Info,
- const REFERENCE< XANYCOMPAREFACTORY > & CompareFactory )
- throw( RUNTIMEEXCEPTION );
+ const css::uno::Reference< css::ucb::XDynamicResultSet > & Source,
+ const css::uno::Sequence< css::ucb::NumberedSortingInfo > & Info,
+ const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory )
+ throw( css::uno::RuntimeException );
};
#endif
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index c1f7a64..83c3230 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1864,7 +1864,7 @@ SortListData::SortListData( long nPos, sal_Bool bModified )
//=========================================================================
void SortedEntryList::Clear()
{
- for ( std::deque< LISTACTION* >::size_type i = 0;
+ for ( std::deque< ListAction* >::size_type i = 0;
i < maData.size(); ++i )
{
delete maData[i];
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index d661d5f..73b2ede 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -70,11 +70,10 @@ public:
};
//-----------------------------------------------------------------------------
-#define LISTACTION com::sun::star::ucb::ListAction
class EventList
{
- std::deque < LISTACTION* > maData;
+ std::deque < css::ucb::ListAction* > maData;
public:
EventList(){}
@@ -83,9 +82,9 @@ public:
sal_uInt32 Count() { return (sal_uInt32) maData.size(); }
void AddEvent( long nType, long nPos, long nCount );
- void Insert( LISTACTION *pAction ) { maData.push_back( pAction ); }
+ void Insert( css::ucb::ListAction *pAction ) { maData.push_back( pAction ); }
void Clear();
- LISTACTION* GetAction( long nIndex ) { return maData[ nIndex ]; }
+ css::ucb::ListAction* GetAction( long nIndex ) { return maData[ nIndex ]; }
};
//-----------------------------------------------------------------------------
@@ -113,39 +112,28 @@ public:
//-----------------------------------------------------------------------------
-#define PROPERTYCHANGEEVENT com::sun::star::beans::PropertyChangeEvent
-#define RUNTIME_EXCEPTION com::sun::star::uno::RuntimeException
-#define REFERENCE com::sun::star::uno::Reference
-#define SEQUENCE com::sun::star::uno::Sequence
-#define XEVENTLISTENER com::sun::star::lang::XEventListener
-#define XRESULTSET com::sun::star::sdbc::XResultSet
-#define SQLEXCEPTION com::sun::star::sdbc::SQLException
-#define XRESULTSETMETADATA com::sun::star::sdbc::XResultSetMetaData
-#define NUMBERED_SORTINGINFO com::sun::star::ucb::NumberedSortingInfo
-#define XANYCOMPAREFACTORY com::sun::star::ucb::XAnyCompareFactory
-
#define RESULTSET_SERVICE_NAME "com.sun.star.ucb.SortedResultSet"
//-----------------------------------------------------------------------------
class SortedResultSet:
public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::lang::XServiceInfo,
- public com::sun::star::lang::XComponent,
- public com::sun::star::ucb::XContentAccess,
- public XRESULTSET,
- public com::sun::star::sdbc::XRow,
- public com::sun::star::sdbc::XCloseable,
- public com::sun::star::sdbc::XResultSetMetaDataSupplier,
- public com::sun::star::beans::XPropertySet
+ public css::lang::XTypeProvider,
+ public css::lang::XServiceInfo,
+ public css::lang::XComponent,
+ public css::ucb::XContentAccess,
+ public css::sdbc::XResultSet,
+ public css::sdbc::XRow,
+ public css::sdbc::XCloseable,
+ public css::sdbc::XResultSetMetaDataSupplier,
+ public css::beans::XPropertySet
{
cppu::OInterfaceContainerHelper *mpDisposeEventListeners;
PropertyChangeListeners_Impl *mpPropChangeListeners;
PropertyChangeListeners_Impl *mpVetoChangeListeners;
- REFERENCE < XRESULTSET > mxOriginal;
- REFERENCE < XRESULTSET > mxOther;
+ css::uno::Reference < css::sdbc::XResultSet > mxOriginal;
+ css::uno::Reference < css::sdbc::XResultSet > mxOther;
SRSPropertySetInfo* mpPropSetInfo;
SortInfo* mpSortInfo;
@@ -162,37 +150,37 @@ class SortedResultSet:
private:
long FindPos( SortListData *pEntry, long nStart, long nEnd )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
long Compare( SortListData *pOne,
SortListData *pTwo )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
- void BuildSortInfo( REFERENCE< XRESULTSET > aResult,
- const SEQUENCE < NUMBERED_SORTINGINFO > &xSortInfo,
- const REFERENCE< XANYCOMPAREFACTORY > &xCompFac );
- long CompareImpl( REFERENCE < XRESULTSET > xResultOne,
- REFERENCE < XRESULTSET > xResultTwo,
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
+ void BuildSortInfo( css::uno::Reference< css::sdbc::XResultSet > aResult,
+ const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo,
+ const css::uno::Reference< css::ucb::XAnyCompareFactory > &xCompFac );
+ long CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
+ css::uno::Reference < css::sdbc::XResultSet > xResultTwo,
long nIndexOne, long nIndexTwo,
SortInfo* pSortInfo )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
- long CompareImpl( REFERENCE < XRESULTSET > xResultOne,
- REFERENCE < XRESULTSET > xResultTwo,
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
+ long CompareImpl( css::uno::Reference < css::sdbc::XResultSet > xResultOne,
+ css::uno::Reference < css::sdbc::XResultSet > xResultTwo,
long nIndexOne, long nIndexTwo )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
- void PropertyChanged( const PROPERTYCHANGEEVENT& rEvt );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
+ void PropertyChanged( const css::beans::PropertyChangeEvent& rEvt );
public:
- SortedResultSet( REFERENCE< XRESULTSET > aResult );
+ SortedResultSet( css::uno::Reference< css::sdbc::XResultSet > aResult );
~SortedResultSet();
const SortedEntryList* GetS2OList() const { return &maS2O; }
const SimpleList* GetO2SList() const { return &maO2S; }
- REFERENCE < XRESULTSET > GetResultSet() const { return mxOriginal; }
+ css::uno::Reference < css::sdbc::XResultSet > GetResultSet() const { return mxOriginal; }
SortInfo* GetSortInfo() const { return mpSortInfo; }
long GetCount() const { return mnCount; }
void CopyData( SortedResultSet* pSource );
- void Initialize( const SEQUENCE < NUMBERED_SORTINGINFO > &xSortInfo,
- const REFERENCE< XANYCOMPAREFACTORY > &xCompFac );
+ void Initialize( const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo,
+ const css::uno::Reference< css::ucb::XAnyCompareFactory > &xCompFac );
void CheckProperties( long nOldCount, sal_Bool bWasFinal );
void InsertNew( long nPos, long nCount );
@@ -214,233 +202,233 @@ public:
// XComponent
virtual void SAL_CALL
- dispose() throw( RUNTIME_EXCEPTION );
+ dispose() throw( css::uno::RuntimeException );
virtual void SAL_CALL
- addEventListener( const REFERENCE< XEVENTLISTENER >& Listener )
- throw( RUNTIME_EXCEPTION );
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
+ throw( css::uno::RuntimeException );
virtual void SAL_CALL
- removeEventListener( const REFERENCE< XEVENTLISTENER >& Listener )
- throw( RUNTIME_EXCEPTION );
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
+ throw( css::uno::RuntimeException );
// XContentAccess
virtual rtl::OUString SAL_CALL
queryContentIdentifierString()
- throw( RUNTIME_EXCEPTION );
- virtual REFERENCE<
- com::sun::star::ucb::XContentIdentifier > SAL_CALL
+ throw( css::uno::RuntimeException );
+ virtual css::uno::Reference<
+ css::ucb::XContentIdentifier > SAL_CALL
queryContentIdentifier()
- throw( RUNTIME_EXCEPTION );
- virtual REFERENCE<
- com::sun::star::ucb::XContent > SAL_CALL
+ throw( css::uno::RuntimeException );
+ virtual css::uno::Reference<
+ css::ucb::XContent > SAL_CALL
queryContent()
- throw( RUNTIME_EXCEPTION );
+ throw( css::uno::RuntimeException );
// XResultSet
virtual sal_Bool SAL_CALL
next()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
isBeforeFirst()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
isAfterLast()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
isFirst()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
isLast()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual void SAL_CALL
beforeFirst()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual void SAL_CALL
afterLast()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
first()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
last()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Int32 SAL_CALL
getRow()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
absolute( sal_Int32 row )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
relative( sal_Int32 rows )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
previous()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual void SAL_CALL
refreshRow()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
rowUpdated()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
rowInserted()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
rowDeleted()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
- virtual REFERENCE<
- com::sun::star::uno::XInterface > SAL_CALL
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
+ virtual css::uno::Reference<
+ css::uno::XInterface > SAL_CALL
getStatement()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
// XRow
virtual sal_Bool SAL_CALL
- wasNull() throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual rtl::OUString SAL_CALL
getString( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Bool SAL_CALL
getBoolean( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Int8 SAL_CALL
getByte( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Int16 SAL_CALL
getShort( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Int32 SAL_CALL
getInt( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual sal_Int64 SAL_CALL
getLong( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual float SAL_CALL
getFloat( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
virtual double SAL_CALL
getDouble( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getBytes( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
- virtual com::sun::star::util::Date SAL_CALL
+ virtual css::util::Date SAL_CALL
getDate( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
- virtual com::sun::star::util::Time SAL_CALL
+ virtual css::util::Time SAL_CALL
getTime( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
- virtual com::sun::star::util::DateTime SAL_CALL
+ virtual css::util::DateTime SAL_CALL
getTimestamp( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
- virtual REFERENCE<
- com::sun::star::io::XInputStream > SAL_CALL
+ virtual css::uno::Reference<
+ css::io::XInputStream > SAL_CALL
getBinaryStream( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
- virtual REFERENCE<
- com::sun::star::io::XInputStream > SAL_CALL
+ virtual css::uno::Reference<
+ css::io::XInputStream > SAL_CALL
getCharacterStream( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
- virtual com::sun::star::uno::Any SAL_CALL
+ virtual css::uno::Any SAL_CALL
getObject( sal_Int32 columnIndex,
- const REFERENCE<
- com::sun::star::container::XNameAccess >& typeMap )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
- virtual REFERENCE<
- com::sun::star::sdbc::XRef > SAL_CALL
+ const css::uno::Reference<
+ css::container::XNameAccess >& typeMap )
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
+ virtual css::uno::Reference<
+ css::sdbc::XRef > SAL_CALL
getRef( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
- virtual REFERENCE<
- com::sun::star::sdbc::XBlob > SAL_CALL
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
+ virtual css::uno::Reference<
+ css::sdbc::XBlob > SAL_CALL
getBlob( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
- virtual REFERENCE<
- com::sun::star::sdbc::XClob > SAL_CALL
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
+ virtual css::uno::Reference<
+ css::sdbc::XClob > SAL_CALL
getClob( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
- virtual REFERENCE<
- com::sun::star::sdbc::XArray > SAL_CALL
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
+ virtual css::uno::Reference<
+ css::sdbc::XArray > SAL_CALL
getArray( sal_Int32 columnIndex )
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
// XCloseable
virtual void SAL_CALL
close()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
// XResultSetMetaDataSupplier
- virtual REFERENCE< XRESULTSETMETADATA > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
getMetaData()
- throw( SQLEXCEPTION, RUNTIME_EXCEPTION );
+ throw( css::sdbc::SQLException, css::uno::RuntimeException );
// XPropertySet
- virtual REFERENCE<
- com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference<
+ css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw( RUNTIME_EXCEPTION );
+ throw( css::uno::RuntimeException );
virtual void SAL_CALL
setPropertyValue( const rtl::OUString& PropertyName,
- const com::sun::star::uno::Any& Value )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::beans::PropertyVetoException,
- com::sun::star::lang::IllegalArgumentException,
- com::sun::star::lang::WrappedTargetException,
- RUNTIME_EXCEPTION );
-
- virtual com::sun::star::uno::Any SAL_CALL
+ const css::uno::Any& Value )
+ throw( css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException );
+
+ virtual css::uno::Any SAL_CALL
getPropertyValue( const rtl::OUString& PropertyName )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- RUNTIME_EXCEPTION );
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException );
virtual void SAL_CALL
addPropertyChangeListener( const rtl::OUString& PropertyName,
- const REFERENCE<
- com::sun::star::beans::XPropertyChangeListener >& Listener )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- RUNTIME_EXCEPTION );
+ const css::uno::Reference<
+ css::beans::XPropertyChangeListener >& Listener )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException );
virtual void SAL_CALL
removePropertyChangeListener( const rtl::OUString& PropertyName,
- const REFERENCE<
- com::sun::star::beans::XPropertyChangeListener >& Listener )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- RUNTIME_EXCEPTION );
+ const css::uno::Reference<
+ css::beans::XPropertyChangeListener >& Listener )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException );
virtual void SAL_CALL
addVetoableChangeListener( const rtl::OUString& PropertyName,
- const REFERENCE<
- com::sun::star::beans::XVetoableChangeListener >& Listener )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- RUNTIME_EXCEPTION );
+ const css::uno::Reference<
+ css::beans::XVetoableChangeListener >& Listener )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException );
virtual void SAL_CALL
removeVetoableChangeListener( const rtl::OUString& PropertyName,
- const REFERENCE<
- com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- RUNTIME_EXCEPTION );
+ const css::uno::Reference<
+ css::beans::XVetoableChangeListener >& aListener )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException );
};
#endif
commit 7215fae352b8956ae1c9b1f629189c5fd2ab4d4c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Apr 1 22:09:59 2013 +0200
expand some more namespace macros
Change-Id: If4b335b238f1fa62d2e3f658429cdec63d561faf
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 653813f..714a7e4 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -41,9 +41,6 @@
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-#define NS_CSS com::sun::star
-#define NS_UNO com::sun::star::uno
-
namespace desktop
{
@@ -89,7 +86,7 @@ struct MigrationItem
::rtl::OUString m_sParentNodeName;
::rtl::OUString m_sPrevSibling;
::rtl::OUString m_sCommandURL;
- NS_UNO::Reference< NS_CSS::container::XIndexContainer > m_xPopupMenu;
+ css::uno::Reference< css::container::XIndexContainer > m_xPopupMenu;
MigrationItem()
:m_xPopupMenu(0)
@@ -99,7 +96,7 @@ struct MigrationItem
MigrationItem(const ::rtl::OUString& sParentNodeName,
const ::rtl::OUString& sPrevSibling,
const ::rtl::OUString& sCommandURL,
- const NS_UNO::Reference< NS_CSS::container::XIndexContainer > xPopupMenu)
+ const css::uno::Reference< css::container::XIndexContainer > xPopupMenu)
{
m_sParentNodeName = sParentNodeName;
m_sPrevSibling = sPrevSibling;
@@ -167,16 +164,16 @@ class NewVersionUIInfo
{
public:
- NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager > getConfigManager(const ::rtl::OUString& sModuleShortName) const;
- NS_UNO::Reference< NS_CSS::container::XIndexContainer > getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const;
- NS_UNO::Reference< NS_CSS::container::XIndexContainer > getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const;
+ css::uno::Reference< css::ui::XUIConfigurationManager > getConfigManager(const ::rtl::OUString& sModuleShortName) const;
+ css::uno::Reference< css::container::XIndexContainer > getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const;
+ css::uno::Reference< css::container::XIndexContainer > getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const;
void init(const ::std::vector< MigrationModuleInfo >& vModulesInfo);
private:
- NS_UNO::Sequence< NS_CSS::beans::PropertyValue > m_lCfgManagerSeq;
- NS_UNO::Sequence< NS_CSS::beans::PropertyValue > m_lNewVersionMenubarSettingsSeq;
- NS_UNO::Sequence< NS_CSS::beans::PropertyValue > m_lNewVersionToolbarSettingsSeq;
+ css::uno::Sequence< css::beans::PropertyValue > m_lCfgManagerSeq;
+ css::uno::Sequence< css::beans::PropertyValue > m_lNewVersionMenubarSettingsSeq;
+ css::uno::Sequence< css::beans::PropertyValue > m_lNewVersionToolbarSettingsSeq;
};
class MigrationImpl
@@ -208,15 +205,15 @@ private:
// helpers
strings_vr getAllFiles(const rtl::OUString& baseURL) const;
strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const;
- NS_UNO::Reference< NS_CSS::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False);
+ css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False);
::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
void compareOldAndNewConfig(const ::rtl::OUString& sParentNodeName,
- const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xOldIndexContainer,
- const NS_UNO::Reference< NS_CSS::container::XIndexContainer >& xNewIndexContainer,
+ const css::uno::Reference< css::container::XIndexContainer >& xOldIndexContainer,
+ const css::uno::Reference< css::container::XIndexContainer >& xNewIndexContainer,
const ::rtl::OUString& sToolbarName);
- void mergeOldToNewVersion(const NS_UNO::Reference< NS_CSS::ui::XUIConfigurationManager >& xCfgManager,
- const NS_UNO::Reference< NS_CSS::container::XIndexContainer>& xIndexContainer,
+ void mergeOldToNewVersion(const css::uno::Reference< css::ui::XUIConfigurationManager >& xCfgManager,
+ const css::uno::Reference< css::container::XIndexContainer>& xIndexContainer,
const ::rtl::OUString& sModuleIdentifier,
const ::rtl::OUString& sResourceURL);
@@ -237,8 +234,6 @@ public:
rtl::OUString getOldVersionName();
};
}
-#undef NS_CSS
-#undef NS_UNO
#endif
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index bd766b7..e1acd35 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -71,15 +71,6 @@ using namespace ::com::sun::star::style;
// -----------------------------------------------------------------------------
-#define NMSP_CPPU cppu
-#define NMSP_UNO com::sun::star::uno
-#define NMSP_LANG com::sun::star::lang
-#define NMSP_SAX com::sun::star::xml::sax
-#define NMSP_REGISTRY com::sun::star::registry
-
-
-#define REF( _def_Obj ) NMSP_UNO::Reference< _def_Obj >
-#define SEQ( _def_Obj ) NMSP_UNO::Sequence< _def_Obj >
#define SVG_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" )
#define SVG_TINY_DTD_STRING OUString( "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG Tiny 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd\">" )
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 81c12a9..46bca87 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -43,32 +43,35 @@
#include <basegfx/tools/unotools.hxx>
#include <com/sun/star/document/XActionLockable.hpp>
+using namespace css;
+using namespace css::uno;
+
// ---------------------------
// - EnhancedCustomShapeEngine -
// ---------------------------
-rtl::OUString EnhancedCustomShapeEngine_getImplementationName()
- throw( NMSP_UNO::RuntimeException )
+OUString EnhancedCustomShapeEngine_getImplementationName()
+ throw( RuntimeException )
{
return OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
}
-sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const rtl::OUString& ServiceName )
- throw( NMSP_UNO::RuntimeException )
+sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const OUString& ServiceName )
+ throw( RuntimeException )
{
return ServiceName == "com.sun.star.drawing.CustomShapeEngine";
}
-SEQ( rtl::OUString ) SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames()
- throw( NMSP_UNO::RuntimeException )
+Sequence< OUString > SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames()
+ throw( RuntimeException )
{
- SEQ( rtl::OUString ) aRet(1);
- rtl::OUString* pArray = aRet.getArray();
+ Sequence< OUString > aRet(1);
+ OUString* pArray = aRet.getArray();
pArray[0] = "com.sun.star.drawing.CustomShapeEngine";
return aRet;
}
// -----------------------------------------------------------------------------
-EnhancedCustomShapeEngine::EnhancedCustomShapeEngine( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr ) :
+EnhancedCustomShapeEngine::EnhancedCustomShapeEngine( const Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxFact ( rxMgr ),
mbForceGroupWithText ( sal_False )
{
@@ -90,11 +93,11 @@ void SAL_CALL EnhancedCustomShapeEngine::release() throw()
// XInitialization ------------------------------------------------------------
-void SAL_CALL EnhancedCustomShapeEngine::initialize( const SEQ( NMSP_UNO::Any )& aArguments )
- throw ( NMSP_UNO::Exception, NMSP_UNO::RuntimeException )
+void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArguments )
+ throw ( Exception, RuntimeException )
{
sal_Int32 i;
- SEQ( NMSP_BEANS::PropertyValue ) aParameter;
+ Sequence< beans::PropertyValue > aParameter;
for ( i = 0; i < aArguments.getLength(); i++ )
{
if ( aArguments[ i ] >>= aParameter )
@@ -102,7 +105,7 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const SEQ( NMSP_UNO::Any )&
}
for ( i = 0; i < aParameter.getLength(); i++ )
{
- const NMSP_BEANS::PropertyValue& rProp = aParameter[ i ];
+ const beans::PropertyValue& rProp = aParameter[ i ];
if ( rProp.Name == "CustomShape" )
rProp.Value >>= mxShape;
else if ( rProp.Name == "ForceGroupWithText" )
@@ -112,18 +115,18 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const SEQ( NMSP_UNO::Any )&
// XServiceInfo ---------------------------------------------------------------
-rtl::OUString SAL_CALL EnhancedCustomShapeEngine::getImplementationName()
- throw( NMSP_UNO::RuntimeException )
+OUString SAL_CALL EnhancedCustomShapeEngine::getImplementationName()
+ throw( RuntimeException )
{
return EnhancedCustomShapeEngine_getImplementationName();
}
-sal_Bool SAL_CALL EnhancedCustomShapeEngine::supportsService( const rtl::OUString& rServiceName )
- throw( NMSP_UNO::RuntimeException )
+sal_Bool SAL_CALL EnhancedCustomShapeEngine::supportsService( const OUString& rServiceName )
+ throw( RuntimeException )
{
return EnhancedCustomShapeEngine_supportsService( rServiceName );
}
-SEQ( rtl::OUString ) SAL_CALL EnhancedCustomShapeEngine::getSupportedServiceNames()
- throw ( NMSP_UNO::RuntimeException )
+Sequence< OUString > SAL_CALL EnhancedCustomShapeEngine::getSupportedServiceNames()
+ throw ( RuntimeException )
{
return EnhancedCustomShapeEngine_getSupportedServiceNames();
}
@@ -224,7 +227,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom
return pRenderedShape;
}
-void SetTemporary( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
+void SetTemporary( uno::Reference< drawing::XShape >& xShape )
{
if ( xShape.is() )
{
@@ -234,10 +237,10 @@ void SetTemporary( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::
}
}
-REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::render()
- throw ( NMSP_UNO::RuntimeException )
+Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
+ throw ( RuntimeException )
{
- REF( com::sun::star::drawing::XShape ) xShape;
+ Reference< drawing::XShape > xShape;
SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
if ( pSdrObjCustomShape )
{
@@ -245,8 +248,8 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende
SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)
pSdrObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
sal_Bool bTextPathOn = sal_False;
- const rtl::OUString sTextPath( "TextPath" );
- com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
+ const OUString sTextPath( "TextPath" );
+ uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
if ( pAny )
*pAny >>= bTextPathOn;
@@ -333,12 +336,12 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende
return xShape;
}
-com::sun::star::awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds()
- throw ( NMSP_UNO::RuntimeException )
+awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds()
+ throw ( RuntimeException )
{
- com::sun::star::awt::Rectangle aTextRect;
+ awt::Rectangle aTextRect;
SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
- ::com::sun::star::uno::Reference< ::com::sun::star::document::XActionLockable > xLockable( mxShape, ::com::sun::star::uno::UNO_QUERY );
+ uno::Reference< document::XActionLockable > xLockable( mxShape, uno::UNO_QUERY );
if ( pSdrObjCustomShape && pSdrObjCustomShape->GetModel() && xLockable.is() && !xLockable->isActionLocked() )
{
if ( pSdrObjCustomShape )
@@ -354,10 +357,10 @@ com::sun::star::awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds
return aTextRect;
}
-com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeometry()
- throw ( NMSP_UNO::RuntimeException )
+drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeometry()
+ throw ( RuntimeException )
{
- com::sun::star::drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords;
+ drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords;
SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
if ( pSdrObjCustomShape )
{
@@ -435,8 +438,8 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng
return aPolyPolygonBezierCoords;
}
-SEQ( REF( com::sun::star::drawing::XCustomShapeHandle ) ) SAL_CALL EnhancedCustomShapeEngine::getInteraction()
- throw ( NMSP_UNO::RuntimeException )
+Sequence< Reference< drawing::XCustomShapeHandle > > SAL_CALL EnhancedCustomShapeEngine::getInteraction()
+ throw ( RuntimeException )
{
sal_uInt32 i, nHdlCount = 0;
SdrObject* pSdrObjCustomShape = GetSdrObjectFromXShape( mxShape );
@@ -445,7 +448,7 @@ SEQ( REF( com::sun::star::drawing::XCustomShapeHandle ) ) SAL_CALL EnhancedCusto
EnhancedCustomShape2d aCustomShape2d( pSdrObjCustomShape );
nHdlCount = aCustomShape2d.GetHdlCount();
}
- SEQ( REF( com::sun::star::drawing::XCustomShapeHandle ) ) aSeq( nHdlCount );
+ Sequence< Reference< drawing::XCustomShapeHandle > > aSeq( nHdlCount );
for ( i = 0; i < nHdlCount; i++ )
aSeq[ i ] = new EnhancedCustomShapeHandle( mxShape, i );
return aSeq;
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
index 1c8fa43..9c5faa1 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
@@ -33,16 +33,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/drawing/XCustomShapeEngine.hpp>
-// -----------------------------------------------------------------------------
-
-#define NMSP_UNO com::sun::star::uno
-#define NMSP_BEANS com::sun::star::beans
-#define NMSP_LANG com::sun::star::lang
-
-
-#define REF( _def_Obj ) NMSP_UNO::Reference< _def_Obj >
-#define SEQ( _def_Obj ) NMSP_UNO::Sequence< _def_Obj >
-
// ---------------------------
// - EnhancedCustomShapeEngine -
// ---------------------------
@@ -52,19 +42,19 @@ class SdrObject;
class SdrObjCustomShape;
class EnhancedCustomShapeEngine : public cppu::WeakImplHelper3
<
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo,
- com::sun::star::drawing::XCustomShapeEngine
+ css::lang::XInitialization,
+ css::lang::XServiceInfo,
+ css::drawing::XCustomShapeEngine
>
{
- REF( NMSP_LANG::XMultiServiceFactory ) mxFact;
- REF( com::sun::star::drawing::XShape ) mxShape;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxFact;
+ css::uno::Reference< css::drawing::XShape > mxShape;
sal_Bool mbForceGroupWithText;
SdrObject* ImplForceGroupWithText( const SdrObjCustomShape* pCustoObj, SdrObject* pRenderedShape );
public:
- EnhancedCustomShapeEngine( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr );
+ EnhancedCustomShapeEngine( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~EnhancedCustomShapeEngine();
// XInterface
@@ -72,34 +62,34 @@ public:
virtual void SAL_CALL release() throw();
// XInitialization
- virtual void SAL_CALL initialize( const SEQ( NMSP_UNO::Any )& aArguments )
- throw ( NMSP_UNO::Exception, NMSP_UNO::RuntimeException );
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw ( css::uno::Exception, css::uno::RuntimeException );
// XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName()
- throw ( NMSP_UNO::RuntimeException );
+ throw ( css::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& rServiceName )
- throw ( NMSP_UNO::RuntimeException );
- virtual SEQ( rtl::OUString ) SAL_CALL getSupportedServiceNames()
- throw ( NMSP_UNO::RuntimeException );
+ throw ( css::uno::RuntimeException );
+ virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
+ throw ( css::uno::RuntimeException );
// XCustomShapeEngine
- virtual REF( com::sun::star::drawing::XShape ) SAL_CALL render()
- throw ( NMSP_UNO::RuntimeException );
- virtual com::sun::star::awt::Rectangle SAL_CALL getTextBounds()
- throw ( NMSP_UNO::RuntimeException );
- virtual com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry()
- throw ( NMSP_UNO::RuntimeException );
- virtual SEQ( REF( com::sun::star::drawing::XCustomShapeHandle ) ) SAL_CALL getInteraction()
- throw ( NMSP_UNO::RuntimeException );
+ virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render()
+ throw ( css::uno::RuntimeException );
+ virtual css::awt::Rectangle SAL_CALL getTextBounds()
+ throw ( css::uno::RuntimeException );
+ virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry()
+ throw ( css::uno::RuntimeException );
+ virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction()
+ throw ( css::uno::RuntimeException );
};
rtl::OUString EnhancedCustomShapeEngine_getImplementationName()
- throw ( NMSP_UNO::RuntimeException );
+ throw ( css::uno::RuntimeException );
sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const rtl::OUString& rServiceName )
- throw( NMSP_UNO::RuntimeException );
-SEQ( rtl::OUString ) SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames()
- throw( NMSP_UNO::RuntimeException );
+ throw( css::uno::RuntimeException );
+css::uno::Sequence< rtl::OUString > SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames()
+ throw( css::uno::RuntimeException );
#endif
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index f80416a..0ea4b3a 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -252,7 +252,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svx_component_getFactory (
}
else if ( rtl_str_compare( pImplName, "com.sun.star.drawing.EnhancedCustomShapeEngine" ) == 0 )
{
- xFactory = createSingleFactory( reinterpret_cast< NMSP_LANG::XMultiServiceFactory* >( pServiceManager ),
+ xFactory = createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
EnhancedCustomShapeEngine_getImplementationName(),
create_EnhancedCustomShapeEngine,
EnhancedCustomShapeEngine_getSupportedServiceNames() );
commit 909fd7e71d0a075bf1318f5df062345f5c059c14
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Apr 1 22:08:52 2013 +0200
remove some more macros
Change-Id: Ia93a938309d25fb9932ed92ca2b2f93bf7991927
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index d1bf131..9142484 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -30,7 +30,7 @@
// - BitmapTransporter -
// ---------------------
-class BitmapTransporter : public OWeakObject, AWT::XBitmap
+class BitmapTransporter : public OWeakObject, css::awt::XBitmap
{
SvMemoryStream m_aStream;
osl::Mutex m_aProtector;
@@ -42,13 +42,13 @@ public:
// XInterface
- virtual ANY SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
+ virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
virtual void SAL_CALL release() throw() { OWeakObject::release(); }
- virtual AWT::Size SAL_CALL getSize() throw();
- virtual SEQ( sal_Int8 ) SAL_CALL getDIB() throw();
- virtual SEQ( sal_Int8 ) SAL_CALL getMaskDIB() throw() { return SEQ( sal_Int8 )(); }
+ virtual css::awt::Size SAL_CALL getSize() throw();
+ virtual Sequence< sal_Int8 > SAL_CALL getDIB() throw();
+ virtual Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw() { return Sequence< sal_Int8 >(); }
// Misc
void lock() { m_aProtector.acquire(); }
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index 1132728..d415116 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -23,7 +23,7 @@
// - ScannerManager -
// ------------------
-REF( XInterface ) SAL_CALL ScannerManager_CreateInstance( const REF( com::sun::star::lang::XMultiServiceFactory )& /*rxFactory*/ ) throw ( Exception )
+Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory >& /*rxFactory*/ ) throw ( Exception )
{
return *( new ScannerManager() );
}
@@ -45,11 +45,11 @@ ScannerManager::~ScannerManager()
// -----------------------------------------------------------------------------
-ANY SAL_CALL ScannerManager::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL ScannerManager::queryInterface( const Type& rType ) throw( RuntimeException )
{
- const ANY aRet( cppu::queryInterface( rType,
+ const Any aRet( cppu::queryInterface( rType,
static_cast< XScannerManager2* >( this ),
- static_cast< AWT::XBitmap* >( this ) ) );
+ static_cast< css::awt::XBitmap* >( this ) ) );
return( aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ) );
}
@@ -70,9 +70,9 @@ void SAL_CALL ScannerManager::release() throw()
// -----------------------------------------------------------------------------
-SEQ( sal_Int8 ) SAL_CALL ScannerManager::getMaskDIB() throw()
+Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB() throw()
{
- return SEQ( sal_Int8 )();
+ return Sequence< sal_Int8 >();
}
// -----------------------------------------------------------------------------
@@ -84,9 +84,9 @@ OUString ScannerManager::getImplementationName_Static() throw()
// -----------------------------------------------------------------------------
-SEQ( OUString ) ScannerManager::getSupportedServiceNames_Static() throw ()
+Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw ()
{
- SEQ( OUString ) aSNS( 1 );
+ Sequence< OUString > aSNS( 1 );
aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.scanner.ScannerManager" );
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 2cf7664..bfbbc99 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -39,12 +39,7 @@ using namespace com::sun::star::scanner;
using ::rtl::OUString;
-#define REF( _def_Obj ) Reference< _def_Obj >
-#define SEQ( _def_Obj ) Sequence< _def_Obj >
-#define ANY Any
-#define AWT com::sun::star::awt
-
-class ScannerManager : public OWeakObject, XScannerManager2, AWT::XBitmap
+class ScannerManager : public OWeakObject, XScannerManager2, css::awt::XBitmap
{
protected:
@@ -60,22 +55,22 @@ public:
virtual ~ScannerManager();
// XInterface
- virtual ANY SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
+ virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException );
virtual void SAL_CALL acquire() throw();
virtual void SAL_CALL release() throw();
// XScannerManager
- virtual SEQ( ScannerContext ) SAL_CALL getAvailableScanners() throw();
+ virtual Sequence< ScannerContext > SAL_CALL getAvailableScanners() throw();
virtual sal_Bool SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
- virtual sal_Bool SAL_CALL configureScannerAndScan( ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& rxListener ) throw( ScannerException );
- virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& rxListener ) throw( ScannerException );
+ virtual sal_Bool SAL_CALL configureScannerAndScan( ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException );
+ virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException );
virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException );
- virtual REF( AWT::XBitmap ) SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException );
+ virtual Reference< css::awt::XBitmap > SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException );
// XBitmap
- virtual AWT::Size SAL_CALL getSize() throw();
- virtual SEQ( sal_Int8 ) SAL_CALL getDIB() throw();
- virtual SEQ( sal_Int8 ) SAL_CALL getMaskDIB() throw();
+ virtual css::awt::Size SAL_CALL getSize() throw();
+ virtual Sequence< sal_Int8 > SAL_CALL getDIB() throw();
+ virtual Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw();
// Misc
static OUString getImplementationName_Static() throw();
@@ -88,7 +83,7 @@ public:
void SetData( void* pData ) { ReleaseData(); mpData = pData; }
};
-REF( XInterface ) SAL_CALL ScannerManager_CreateInstance( const REF( com::sun::star::lang::XMultiServiceFactory )& rxFactory ) throw( Exception );
+Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory >& rxFactory ) throw( Exception );
#endif
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 985a748..aace9cb 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -42,20 +42,20 @@ BitmapTransporter::~BitmapTransporter()
// -----------------------------------------------------------------------------
-ANY SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( RuntimeException )
{
- const ANY aRet( cppu::queryInterface( rType, static_cast< AWT::XBitmap* >( this ) ) );
+ const Any aRet( cppu::queryInterface( rType, static_cast< css::awt::XBitmap* >( this ) ) );
return( aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ) );
}
// -----------------------------------------------------------------------------
-AWT::Size BitmapTransporter::getSize() throw()
+css::awt::Size BitmapTransporter::getSize() throw()
{
osl::MutexGuard aGuard( m_aProtector );
int nPreviousPos = m_aStream.Tell();
- AWT::Size aRet;
+ css::awt::Size aRet;
// ensure that there is at least a header
m_aStream.Seek( STREAM_SEEK_TO_END );
@@ -75,7 +75,7 @@ AWT::Size BitmapTransporter::getSize() throw()
// -----------------------------------------------------------------------------
-SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
+Sequence< sal_Int8 > BitmapTransporter::getDIB() throw()
{
osl::MutexGuard aGuard( m_aProtector );
int nPreviousPos = m_aStream.Tell();
@@ -85,7 +85,7 @@ SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
int nBytes = m_aStream.Tell();
m_aStream.Seek( 0 );
- SEQ( sal_Int8 ) aValue( nBytes );
+ Sequence< sal_Int8 > aValue( nBytes );
m_aStream.Read( aValue.getArray(), nBytes );
m_aStream.Seek( nPreviousPos );
@@ -99,7 +99,7 @@ SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
struct SaneHolder
{
Sane m_aSane;
- REF( AWT::XBitmap ) m_xBitmap;
+ Reference< css::awt::XBitmap > m_xBitmap;
osl::Mutex m_aProtector;
ScanError m_nError;
bool m_bBusy;
@@ -146,7 +146,7 @@ namespace
class ScannerThread : public osl::Thread
{
boost::shared_ptr<SaneHolder> m_pHolder;
- REF( com::sun::star::lang::XEventListener ) m_xListener;
+ Reference< com::sun::star::lang::XEventListener > m_xListener;
ScannerManager* m_pManager; // just for the disposing call
public:
@@ -154,7 +154,7 @@ public:
virtual void onTerminated() { delete this; }
public:
ScannerThread( boost::shared_ptr<SaneHolder> pHolder,
- const REF( com::sun::star::lang::XEventListener )& listener,
+ const Reference< com::sun::star::lang::XEventListener >& listener,
ScannerManager* pManager );
virtual ~ScannerThread();
};
@@ -163,7 +163,7 @@ public:
ScannerThread::ScannerThread(
boost::shared_ptr<SaneHolder> pHolder,
- const REF( com::sun::star::lang::XEventListener )& listener,
+ const Reference< com::sun::star::lang::XEventListener >& listener,
ScannerManager* pManager )
: m_pHolder( pHolder ), m_xListener( listener ), m_pManager( pManager )
{
@@ -183,9 +183,9 @@ void ScannerThread::run()
{
osl::MutexGuard aGuard( m_pHolder->m_aProtector );
BitmapTransporter* pTransporter = new BitmapTransporter;
- REF( XInterface ) aIf( static_cast< OWeakObject* >( pTransporter ) );
+ Reference< XInterface > aIf( static_cast< OWeakObject* >( pTransporter ) );
- m_pHolder->m_xBitmap = REF( AWT::XBitmap )( aIf, UNO_QUERY );
+ m_pHolder->m_xBitmap = Reference< css::awt::XBitmap >( aIf, UNO_QUERY );
m_pHolder->m_bBusy = true;
if( m_pHolder->m_aSane.IsOpen() )
@@ -202,7 +202,7 @@ void ScannerThread::run()
m_pHolder->m_nError = ScanError_ScannerNotAvailable;
- REF( XInterface ) xXInterface( static_cast< OWeakObject* >( m_pManager ) );
+ Reference< XInterface > xXInterface( static_cast< OWeakObject* >( m_pManager ) );
m_xListener->disposing( com::sun::star::lang::EventObject(xXInterface) );
m_pHolder->m_bBusy = false;
}
@@ -225,23 +225,23 @@ void ScannerManager::ReleaseData()
// -----------------------------------------------------------------------------
-AWT::Size ScannerManager::getSize() throw()
+css::awt::Size ScannerManager::getSize() throw()
{
- AWT::Size aRet;
+ css::awt::Size aRet;
aRet.Width = aRet.Height = 0;
return aRet;
}
// -----------------------------------------------------------------------------
-SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
+Sequence< sal_Int8 > ScannerManager::getDIB() throw()
{
- return SEQ( sal_Int8 )();
+ return Sequence< sal_Int8 >();
}
// -----------------------------------------------------------------------------
-SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
+Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw()
{
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
@@ -255,19 +255,19 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
if( Sane::IsSane() )
{
- SEQ( ScannerContext ) aRet(1);
+ Sequence< ScannerContext > aRet(1);
aRet.getArray()[0].ScannerName = ::rtl::OUString("SANE");
aRet.getArray()[0].InternalData = 0;
return aRet;
}
- return SEQ( ScannerContext )();
+ return Sequence< ScannerContext >();
}
// -----------------------------------------------------------------------------
sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_context,
- const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException )
+ const Reference< com::sun::star::lang::XEventListener >& listener ) throw( ScannerException )
{
bool bRet;
bool bScan;
@@ -282,7 +282,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString("Scanner does not exist"),
- REF( XScannerManager )( this ),
+ Reference< XScannerManager >( this ),
ScanError_InvalidContext
);
@@ -290,7 +290,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
if( pHolder->m_bBusy )
throw ScannerException(
::rtl::OUString("Scanner is busy"),
- REF( XScannerManager )( this ),
+ Reference< XScannerManager >( this ),
ScanError_ScanInProgress
);
@@ -309,7 +309,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
// -----------------------------------------------------------------------------
void ScannerManager::startScan( const ScannerContext& scanner_context,
- const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException )
+ const Reference< com::sun::star::lang::XEventListener >& listener ) throw( ScannerException )
{
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
@@ -321,14 +321,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString("Scanner does not exist"),
- REF( XScannerManager )( this ),
+ Reference< XScannerManager >( this ),
ScanError_InvalidContext
);
boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
if( pHolder->m_bBusy )
throw ScannerException(
::rtl::OUString("Scanner is busy"),
- REF( XScannerManager )( this ),
+ Reference< XScannerManager >( this ),
ScanError_ScanInProgress
);
pHolder->m_bBusy = true;
@@ -347,7 +347,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString("Scanner does not exist"),
- REF( XScannerManager )( this ),
+ Reference< XScannerManager >( this ),
ScanError_InvalidContext
);
@@ -358,7 +358,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
// -----------------------------------------------------------------------------
-REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException )
+Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException )
{
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
@@ -366,15 +366,15 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con
if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString("Scanner does not exist"),
- REF( XScannerManager )( this ),
+ Reference< XScannerManager >( this ),
ScanError_InvalidContext
);
boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
osl::MutexGuard aProtGuard( pHolder->m_aProtector );
- REF( AWT::XBitmap ) xRet( pHolder->m_xBitmap );
- pHolder->m_xBitmap = REF( AWT::XBitmap )();
+ Reference< css::awt::XBitmap > xRet( pHolder->m_xBitmap );
+ pHolder->m_xBitmap = Reference< css::awt::XBitmap >();
return xRet;
}
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index e52b688..60e1d58 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -779,9 +779,9 @@ void ScannerManager::ReleaseData()
}
}
-AWT::Size ScannerManager::getSize() throw()
+awt::Size ScannerManager::getSize() throw()
{
- AWT::Size aRet;
+ awt::Size aRet;
HGLOBAL hDIB = (HGLOBAL)(long) mpData;
if( hDIB )
@@ -804,9 +804,9 @@ AWT::Size ScannerManager::getSize() throw()
return aRet;
}
-SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
+uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw()
{
- SEQ( sal_Int8 ) aRet;
+ uno::Sequence< sal_Int8 > aRet;
if( mpData )
{
@@ -845,7 +845,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
break;
}
- aRet = SEQ( sal_Int8 )( sizeof( BITMAPFILEHEADER ) + nDIBSize );
+ aRet = uno::Sequence< sal_Int8 >( sizeof( BITMAPFILEHEADER ) + nDIBSize );
sal_Int8* pBuf = aRet.getArray();
SvMemoryStream* pMemStm = new SvMemoryStream( (char*) pBuf, sizeof( BITMAPFILEHEADER ), STREAM_WRITE );
@@ -864,10 +864,10 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
return aRet;
}
-SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
+uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners() throw()
{
osl::MutexGuard aGuard( maProtector );
- SEQ( ScannerContext ) aRet( 1 );
+ uno::Sequence< ScannerContext > aRet( 1 );
aRet.getArray()[0].ScannerName = ::rtl::OUString( "TWAIN" );
aRet.getArray()[0].InternalData = 0;
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index dadaf32..daf2a07 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -29,12 +29,12 @@ using namespace com::sun::star::registry;
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
- REF( ::com::sun::star::lang::XSingleServiceFactory ) xFactory;
+ Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
if( ::rtl::OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() )
{
- xFactory = REF( ::com::sun::star::lang::XSingleServiceFactory )( ::cppu::createSingleFactory(
+ xFactory = Reference< ::com::sun::star::lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ),
ScannerManager::getImplementationName_Static(),
ScannerManager_CreateInstance,
commit e09fbcb5647f18cf053052e49aa28d6f0003cd01
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Apr 1 22:08:35 2013 +0200
remove odd macro
Change-Id: Ia818e933a61b28c6d2f74651e12a04a7a3a3190a
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 42d60a0..ba5ed76 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -49,6 +49,7 @@ namespace dbtools
using ::com::sun::star::beans::XPropertySetInfo;
using ::com::sun::star::lang::Locale;
using ::com::sun::star::uno::Exception;
+ using ::com::sun::star::uno::Reference;
using ::com::sun::star::i18n::LocaleData;
using ::com::sun::star::i18n::XLocaleData;
using ::com::sun::star::i18n::LocaleDataItem;
@@ -58,8 +59,6 @@ namespace dbtools
using ::connectivity::OSQLParseNode;
- #define Reference ::com::sun::star::uno::Reference
-
//=====================================================================
//---------------------------------------------------------------------
static sal_Unicode lcl_getSeparatorChar( const ::rtl::OUString& _rSeparator, sal_Unicode _nFallback )
commit c0fde0656208ef6c9bab244f2f8aba41b7d7877f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Apr 1 19:01:52 2013 +0200
write even better code
Change-Id: I0f193b9c17da5855fd515251543afc68b8885b9b
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 1b6122c..3add351 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -123,14 +123,14 @@ void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException)
notImplemented();
}
-void SAL_CALL SIDEModel::storeAsURL( const ::rtl::OUString&, const uno::Sequence< PROPERTYVALUE >& )
+void SAL_CALL SIDEModel::storeAsURL( const ::rtl::OUString&, const uno::Sequence< beans::PropertyValue >& )
throw (io::IOException, uno::RuntimeException)
{
notImplemented();
}
void SAL_CALL SIDEModel::storeToURL( const ::rtl::OUString&,
- const uno::Sequence< PROPERTYVALUE >& )
+ const uno::Sequence< beans::PropertyValue >& )
throw (io::IOException, uno::RuntimeException)
{
notImplemented();
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index 4d6fd0c..cf9eb35 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -51,15 +51,15 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void)
throw( ::com::sun::star::uno::RuntimeException );
// XStorable2
- virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& )
+ virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { notImplemented(); }
// XStorable
virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL storeAsURL( const ::rtl::OUString& sURL,
- const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments )
+ const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL storeToURL( const ::rtl::OUString& sURL,
- const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments )
+ const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index e0ac759..6839bcb 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -36,9 +36,7 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentRecovery.hpp>
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
-
#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
-
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/document/XEventListener.hpp>
@@ -83,10 +81,8 @@
#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-
#include <com/sun/star/task/XInteractionHandler.hpp>
-//________________________________________________________________________________________________________
#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32
@@ -95,76 +91,6 @@
#include <svl/lstner.hxx>
-// Some defines to write better code :-)
-#define XCHILD ::com::sun::star::container::XChild
-#define XNAMECONTAINER ::com::sun::star::container::XNameContainer
-#define XCONTROLLER ::com::sun::star::frame::XController
-#define XEVENTLISTENER ::com::sun::star::lang::XEventListener
-#define XINTERFACE ::com::sun::star::uno::XInterface
-#define XCOMPONENT ::com::sun::star::lang::XComponent
-#define XMODEL ::com::sun::star::frame::XModel
-#define XMODEL2 ::com::sun::star::frame::XModel2
-#define XMODIFIABLE2 ::com::sun::star::util::XModifiable2
-#define XMODIFYBROADCASTER ::com::sun::star::util::XModifyBroadcaster
-#define XMODIFYLISTENER ::com::sun::star::util::XModifyListener
-#define XCLOSEABLE ::com::sun::star::util::XCloseable
-#define XCLOSEBROADCASTER ::com::sun::star::util::XCloseBroadcaster
-#define XCLOSELISTENER ::com::sun::star::util::XCloseListener
-#define XPRINTABLE ::com::sun::star::view::XPrintable
-#define XPRINTJOBBROADCASTER ::com::sun::star::view::XPrintJobBroadcaster
-#define XSTORABLE ::com::sun::star::frame::XStorable
-#define XSTORABLE2 ::com::sun::star::frame::XStorable2
-#define XLOADABLE ::com::sun::star::frame::XLoadable
-#define XTYPEPROVIDER ::com::sun::star::lang::XTypeProvider
-#define XSTARBASICACCESS ::com::sun::star::script::XStarBasicAccess
-#define NOSUCHELEMENTEXCEPTION ::com::sun::star::container::NoSuchElementException
-#define ELEMENTEXISTEXCEPTION ::com::sun::star::container::ElementExistException
-#define XNAMEREPLACE ::com::sun::star::container::XNameReplace
-#define DOCEVENTOBJECT ::com::sun::star::document::EventObject
-#define XDOCEVENTLISTENER ::com::sun::star::document::XEventListener
-#define XEVENTBROADCASTER ::com::sun::star::document::XEventBroadcaster
-#define XDOCUMENTEVENTBROADCASTER ::com::sun::star::document::XDocumentEventBroadcaster
-#define XEVENTSSUPPLIER ::com::sun::star::document::XEventsSupplier
-#define XEMBEDDEDSCRIPTS ::com::sun::star::document::XEmbeddedScripts
-#define XSCRIPTINVOCATIONCONTEXT ::com::sun::star::document::XScriptInvocationContext
-
-#define NOSUPPORTEXCEPTION ::com::sun::star::lang::NoSupportException
-#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define CLOSEVETOEXCEPTION ::com::sun::star::util::CloseVetoException
-#define ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException
-#define IOEXCEPTION ::com::sun::star::io::IOException
-#define EXCEPTION ::com::sun::star::uno::Exception
-
-#define ANY ::com::sun::star::uno::Any
-#define EVENTOBJECT ::com::sun::star::lang::EventObject
-#define PROPERTYVALUE ::com::sun::star::beans::PropertyValue
-#define REFERENCE ::com::sun::star::uno::Reference
-#define MUTEX ::osl::Mutex
-#define UNOTYPE ::com::sun::star::uno::Type
-#define XVIEWDATASUPPLIER ::com::sun::star::document::XViewDataSupplier
-#define XTRANSFERABLE ::com::sun::star::datatransfer::XTransferable
-#define DATAFLAVOR ::com::sun::star::datatransfer::DataFlavor
-
-#define XUNOTUNNEL ::com::sun::star::lang::XUnoTunnel
-
-#define XDOCUMENTSUBSTORAGESUPPLIER ::com::sun::star::document::XDocumentSubStorageSupplier
-#define XSTORAGEBASEDDOCUMENT ::com::sun::star::document::XStorageBasedDocument
-#define XSTORAGE ::com::sun::star::embed::XStorage
-#define XVISUALOBJECT ::com::sun::star::embed::XVisualObject
-
-#define XSCRIPTPROVIDERSUPPLIER ::com::sun::star::script::provider::XScriptProviderSupplier
-#define XSCRIPTPROVIDER ::com::sun::star::script::provider::XScriptProvider
-
-#define XUICONFIGURATIONMANAGERSUPPLIER ::com::sun::star::ui::XUIConfigurationManagerSupplier
-#define XUICONFIGURATIONMANAGER ::com::sun::star::ui::XUIConfigurationManager
-#define XMODULE ::com::sun::star::frame::XModule
-#define XTITLE ::com::sun::star::frame::XTitle
-#define XTITLECHANGEBROADCASTER ::com::sun::star::frame::XTitleChangeBroadcaster
-#define XUNTITLEDNUMBERS ::com::sun::star::frame::XUntitledNumbers
-
-//________________________________________________________________________________________________________
-// forwards
-//________________________________________________________________________________________________________
class SfxPrinter;
class SfxViewShell;
class SfxObjectShell ;
@@ -204,38 +130,38 @@ namespace sfx { namespace intern {
SfxListener
*/
-typedef ::comphelper::WeakImplHelper32 < XCHILD
- , ::com::sun::star::document::XDocumentPropertiesSupplier
- , ::com::sun::star::document::XCmisDocument
- , ::com::sun::star::rdf::XDocumentMetadataAccess
- , ::com::sun::star::document::XDocumentRecovery
- , ::com::sun::star::document::XUndoManagerSupplier
- , XEVENTBROADCASTER
- , XDOCUMENTEVENTBROADCASTER
- , XEVENTLISTENER
- , XEVENTSSUPPLIER
- , XEMBEDDEDSCRIPTS
- , XSCRIPTINVOCATIONCONTEXT
- , XMODEL2
- , XMODIFIABLE2
- , XPRINTABLE
- , XPRINTJOBBROADCASTER
- , XSTORABLE2
- , XLOADABLE
- , XSTARBASICACCESS
- , XVIEWDATASUPPLIER
- , XCLOSEABLE // => XCLOSEBROADCASTER
- , XTRANSFERABLE
- , XDOCUMENTSUBSTORAGESUPPLIER
- , XSTORAGEBASEDDOCUMENT
- , XSCRIPTPROVIDERSUPPLIER
- , XUICONFIGURATIONMANAGERSUPPLIER
- , XVISUALOBJECT
- , XUNOTUNNEL
- , XMODULE
- , XTITLE
- , XTITLECHANGEBROADCASTER
- , XUNTITLEDNUMBERS
+typedef ::comphelper::WeakImplHelper32 < css::container::XChild
+ , css::document::XDocumentPropertiesSupplier
+ , css::document::XCmisDocument
+ , css::rdf::XDocumentMetadataAccess
+ , css::document::XDocumentRecovery
+ , css::document::XUndoManagerSupplier
+ , css::document::XEventBroadcaster
+ , css::document::XDocumentEventBroadcaster
+ , css::lang::XEventListener
+ , css::document::XEventsSupplier
+ , css::document::XEmbeddedScripts
+ , css::document::XScriptInvocationContext
+ , css::frame::XModel2
+ , css::util::XModifiable2
+ , css::view::XPrintable
+ , css::view::XPrintJobBroadcaster
+ , css::frame::XStorable2
+ , css::frame::XLoadable
+ , css::script::XStarBasicAccess
+ , css::document::XViewDataSupplier
+ , css::util::XCloseable // => css::util::XCloseBroadcaster
+ , css::datatransfer::XTransferable
+ , css::document::XDocumentSubStorageSupplier
+ , css::document::XStorageBasedDocument
+ , css::script::provider::XScriptProviderSupplier
+ , css::ui::XUIConfigurationManagerSupplier
+ , css::embed::XVisualObject
+ , css::lang::XUnoTunnel
+ , css::frame::XModule
+ , css::frame::XTitle
+ , css::frame::XTitleChangeBroadcaster
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list