[Libreoffice-commits] core.git: 3 commits - dbaccess/inc sc/inc svtools/inc svx/inc sw/inc sw/source vcl/inc
Thomas Arnhold
thomas at arnhold.org
Mon Apr 1 23:39:19 PDT 2013
dbaccess/inc/pch/precompiled_dbu.hxx | 2
sc/inc/pch/precompiled_sc.hxx | 3
svtools/inc/pch/precompiled_svt.hxx | 5 -
svtools/inc/svtools/accessibletable.hxx | 36 +++-------
svtools/inc/svtools/accessibletableprovider.hxx | 55 +++++----------
svtools/inc/svtools/brwbox.hxx | 43 +++++-------
svtools/inc/svtools/svtabbx.hxx | 20 ++---
svtools/inc/svtools/table/tablecontrol.hxx | 12 +--
svx/inc/pch/precompiled_svxcore.hxx | 7 +
sw/inc/pch/precompiled_sw.hxx | 1
sw/source/ui/chrdlg/drpcps.cxx | 31 +++-----
sw/source/ui/dochdl/swdtflvr.cxx | 10 +-
sw/source/ui/inc/swdtflvr.hxx | 11 +--
sw/source/ui/uno/swdetect.cxx | 85 +++++++++++-------------
sw/source/ui/uno/swdetect.hxx | 10 --
sw/source/ui/uno/unomodule.cxx | 36 +++++-----
sw/source/ui/uno/unomodule.hxx | 36 +++-------
vcl/inc/pch/precompiled_vcl.hxx | 6 -
18 files changed, 183 insertions(+), 226 deletions(-)
New commits:
commit 07b0617a5af5f1d942595695b1e3f27dbaea6bf8
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 2 01:14:46 2013 +0200
update pch files
Change-Id: Ic33dd20a469d1905d2bdaf1ce3633e6ac6db8a4c
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index 9e6f957..4983860 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -179,6 +179,7 @@
#include <com/sun/star/sdb/application/CopyTableWizard.hpp>
#include <com/sun/star/sdb/application/DatabaseObject.hpp>
#include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
+#include <com/sun/star/sdb/application/MacroMigrationWizard.hpp>
#include <com/sun/star/sdb/application/NamedDatabaseObject.hpp>
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
@@ -458,6 +459,7 @@
#include <unotools/viewoptions.hxx>
#include <utility>
#include <vcl/accel.hxx>
+#include <vcl/builder.hxx>
#include <vcl/button.hxx>
#include <vcl/combobox.hxx>
#include <vcl/edit.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index c8ef850..b81439c 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -482,6 +482,7 @@
#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
#include <comphelper/uno3.hxx>
+#include <config_features.h>
#include <config_telepathy.h>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/component_context.hxx>
@@ -491,7 +492,6 @@
#include <cstdio>
#include <cstring>
#include <ctype.h>
-#include <deque>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
@@ -929,7 +929,6 @@
#include <vcl/keycodes.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/lstbox.hxx>
-#include <vcl/mapmod.hxx>
#include <vcl/metric.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/morebtn.hxx>
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index ef7c0c3..6f4dcdc 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -97,6 +97,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -208,6 +209,8 @@
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRetry.hpp>
#include <com/sun/star/text/GraphicCrop.hpp>
+#include <com/sun/star/text/XPageCursor.hpp>
+#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/ucb/ContentCreationException.hpp>
@@ -316,7 +319,6 @@
#include <osl/module.h>
#include <osl/module.hxx>
#include <osl/mutex.hxx>
-#include <osl/security.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/crc.h>
#include <rtl/instance.hxx>
@@ -450,7 +452,6 @@
#include <vcl/imagerepository.hxx>
#include <vcl/lazydelete.hxx>
#include <vcl/lineinfo.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index d07fa1d..84c5f29f 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -16,8 +16,6 @@
#include "boost/scoped_ptr.hpp"
#include "com/sun/star/document/XStorageBasedDocument.hpp"
-#include "com/sun/star/system/SystemShellExecute.hpp"
-#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
#include "cppuhelper/factory.hxx"
#include "editeng/AccessibleStringWrap.hxx"
#include "editeng/borderline.hxx"
@@ -199,8 +197,10 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/status/ClipboardFormats.hpp>
#include <com/sun/star/frame/status/ItemStatus.hpp>
+#include <com/sun/star/graphic/GraphicType.hpp>
#include <com/sun/star/graphic/PrimitiveFactory2D.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicRenderer.hpp>
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
@@ -235,6 +235,8 @@
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/table/TableBorder.hpp>
#include <com/sun/star/table/XMergeableCell.hpp>
@@ -249,6 +251,7 @@
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 0c0cbb6..57eb61b 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -460,6 +460,7 @@
#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
#include <comphelper/uno3.hxx>
+#include <config_features.h>
#include <config_graphite.h>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/component_context.hxx>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index b7f7a0c..c75e6c8 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -79,13 +79,11 @@
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/uno/XNamingService.hpp"
-#include "com/sun/star/util/XStringMapping.hpp"
#include "com/sun/star/view/DuplexMode.hpp"
#include "comphelper/processfactory.hxx"
#include "cppuhelper/compbase1.hxx"
#include "cppuhelper/compbase2.hxx"
#include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/implbase2.hxx"
#include "i18npool/languagetag.hxx"
#include "i18npool/mslangid.hxx"
#include "i18nutil/unicode.hxx"
@@ -162,6 +160,7 @@
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
+#include <boost/static_assert.hpp>
#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>
#include <cmath>
@@ -227,7 +226,6 @@
#include <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/java/JavaVirtualMachine.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/Locale.hpp>
@@ -275,6 +273,7 @@
#include <comphelper/scopeguard.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/string.hxx>
+#include <config_features.h>
#include <config_graphite.h>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/factory.hxx>
@@ -293,7 +292,6 @@
#include <iostream>
#include <jerror.h>
#include <jpeglib.h>
-#include <jvmaccess/virtualmachine.hxx>
#include <lcms2.h>
#include <limits.h>
#include <limits>
commit 7f8e721e0536e68fca4d7abdf9711427eb1c576e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 2 00:50:08 2013 +0200
sw: remove macros
Change-Id: Iec447843f4f314bbd562f2e4821b4bcfadeeb565
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index f8838fd..efae402 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -49,14 +49,9 @@
#include "drpcps.hrc"
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-//using namespace i18n; !using this namespace leads to mysterious conflicts with ScriptType::...!
-// so don't use this instead of the following defines!
-
-#define I18N ::com::sun::star::i18n
-#define I18N_SCRIPTTYPE ::com::sun::star::i18n::ScriptType
+using namespace css;
+using namespace css::uno;
+using namespace css::lang;
// Globals ******************************************************************
@@ -95,7 +90,7 @@ class SwDropCapsPict : public Control
SvxFont maCJKFont;
SvxFont maCTLFont;
Size maTextSize;
- Reference< I18N::XBreakIterator > xBreak;
+ Reference< css::i18n::XBreakIterator > xBreak;
virtual void Paint(const Rectangle &rRect);
void CheckScript( void );
@@ -200,7 +195,7 @@ void SwDropCapsPict::GetFirstScriptSegment(xub_StrLen &start, xub_StrLen &end, s
if( maScriptChanges.empty() )
{
end = maText.Len();
- scriptType = I18N_SCRIPTTYPE::LATIN;
+ scriptType = css::i18n::ScriptType::LATIN;
}
else
{
@@ -380,7 +375,7 @@ void SwDropCapsPict::DrawPrev( const Point& rPt )
GetFirstScriptSegment(nStart, nEnd, nScript);
do
{
- SvxFont& rFnt = (nScript==I18N_SCRIPTTYPE::ASIAN) ? maCJKFont : ((nScript==I18N_SCRIPTTYPE::COMPLEX) ? maCTLFont : maFont);
+ SvxFont& rFnt = (nScript==css::i18n::ScriptType::ASIAN) ? maCJKFont : ((nScript==css::i18n::ScriptType::COMPLEX) ? maCTLFont : maFont);
mpPrinter->SetFont( rFnt );
rFnt.DrawPrev( this, mpPrinter, aPt, maText, nStart, nEnd - nStart );
@@ -403,17 +398,17 @@ void SwDropCapsPict::CheckScript( void )
if( !xBreak.is() )
{
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
- xBreak = I18N::BreakIterator::create(xContext);
+ xBreak = css::i18n::BreakIterator::create(xContext);
}
sal_uInt16 nScript = xBreak->getScriptType( maText, 0 );
sal_uInt16 nChg = 0;
- if( I18N_SCRIPTTYPE::WEAK == nScript )
+ if( css::i18n::ScriptType::WEAK == nScript )
{
nChg = (xub_StrLen)xBreak->endOfScript( maText, nChg, nScript );
if( nChg < maText.Len() )
nScript = xBreak->getScriptType( maText, nChg );
else
- nScript = I18N_SCRIPTTYPE::LATIN;
+ nScript = css::i18n::ScriptType::LATIN;
}
do
@@ -446,8 +441,8 @@ Size SwDropCapsPict::CalcTextSize( void )
long nCTLAscent = 0;
do
{
- SvxFont& rFnt = ( nScript == I18N_SCRIPTTYPE::ASIAN )? maCJKFont :
- ( ( nScript == I18N_SCRIPTTYPE::COMPLEX )? maCTLFont : maFont );
+ SvxFont& rFnt = ( nScript == css::i18n::ScriptType::ASIAN )? maCJKFont :
+ ( ( nScript == css::i18n::ScriptType::COMPLEX )? maCTLFont : maFont );
sal_uLong nWidth = rFnt.GetTxtSize( mpPrinter, maText, nStart, nEnd-nStart ).Width();
if( nIdx < maScriptChanges.size() )
@@ -455,10 +450,10 @@ Size SwDropCapsPict::CalcTextSize( void )
nTxtWidth += nWidth;
switch(nScript)
{
- case I18N_SCRIPTTYPE::ASIAN:
+ case css::i18n::ScriptType::ASIAN:
calcFontHeightAnyAscent( this, maCJKFont, nCJKHeight, nCJKAscent );
break;
- case I18N_SCRIPTTYPE::COMPLEX:
+ case css::i18n::ScriptType::COMPLEX:
calcFontHeightAnyAscent( this, maCTLFont, nCTLHeight, nCTLAscent );
break;
default:
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 34d9ff4..ecc0928 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -131,7 +131,6 @@ extern bool bExecuteDrag;
#define SWTRANSFER_GRAPHIC_INSERTED 0x00000040
using namespace ::svx;
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::datatransfer;
@@ -370,7 +369,7 @@ namespace
}
}
-sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
+sal_Bool SwTransferable::GetData( const DataFlavor& rFlavor )
{
sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
@@ -574,7 +573,7 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
void* pObject, sal_uInt32 nObjectType,
- const DATA_FLAVOR& /*rFlavor*/ )
+ const DataFlavor& /*rFlavor*/ )
{
sal_Bool bRet = sal_False;
WriterRef xWrt;
@@ -1768,7 +1767,7 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
// insert replacement image ( if there is one ) into the object helper
if ( nGrFormat )
{
- datatransfer::DataFlavor aDataFlavor;
+ DataFlavor aDataFlavor;
SotExchange::GetFormatDataFlavor( nGrFormat, aDataFlavor );
xObjRef.SetGraphic( aGraphic, aDataFlavor.MimeType );
}
@@ -3383,8 +3382,7 @@ void SwTransferable::CreateSelection( SwWrtShell& rSh,
pNew->pCreatorView = _pCreatorView;
- uno::Reference<
- datatransfer::XTransferable > xRef( pNew );
+ uno::Reference< XTransferable > xRef( pNew );
pMod->pXSelection = pNew;
pNew->CopyToSelection( rSh.GetWin() );
}
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx
index c461026..e790297 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/ui/inc/swdtflvr.hxx
@@ -52,7 +52,6 @@ namespace nsTransferBufferType
const sal_uInt16 TRNSFR_DRAWING = 0x0081; // drawing is internal too!
}
-#define DATA_FLAVOR ::com::sun::star::datatransfer::DataFlavor
class SwTransferable : public TransferableHelper
{
@@ -78,7 +77,7 @@ class SwTransferable : public TransferableHelper
sal_Bool bCleanUp :1; //D&D cleanup after Drop (not by internal Drop)
// helper methods for the copy
- com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const;
+ css::uno::Reference < css::embed::XEmbeddedObject > FindOLEObj( sal_Int64& nAspect ) const;
const Graphic* FindOLEReplacementGraphic() const;
void DeleteSelection();
@@ -139,11 +138,11 @@ class SwTransferable : public TransferableHelper
protected:
virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const DATA_FLAVOR& rFlavor );
+ virtual sal_Bool GetData( const css::datatransfer::DataFlavor& rFlavor );
virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm,
void* pUserObject,
sal_uInt32 nUserObjectId,
- const DATA_FLAVOR& rFlavor );
+ const css::datatransfer::DataFlavor& rFlavor );
virtual void DragFinished( sal_Int8 nDropAction );
virtual void ObjectReleased();
@@ -205,9 +204,9 @@ public:
// the related SwView is being closed and the SwTransferable is invalid now
void Invalidate() {pWrtShell = 0;}
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException );
};
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 30bfba3..fd23917 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -67,9 +67,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 ::rtl::OUString;
-SwFilterDetect::SwFilterDetect( const REFERENCE < lang::XMultiServiceFactory >& /*xFactory*/ )
+SwFilterDetect::SwFilterDetect( const Reference < XMultiServiceFactory >& /*xFactory*/ )
{
}
@@ -77,17 +76,17 @@ SwFilterDetect::~SwFilterDetect()
{
}
-::rtl::OUString SAL_CALL SwFilterDetect::detect( uno::Sequence< beans::PropertyValue >& lDescriptor ) throw( uno::RuntimeException )
+OUString SAL_CALL SwFilterDetect::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
@@ -166,13 +165,13 @@ SwFilterDetect::~SwFilterDetect()
bWasReadOnly = pItem && pItem->GetValue();
const SfxFilter* pFilter = 0;
- String aPrefix = rtl::OUString("private:factory/");
+ String aPrefix = OUString("private:factory/");
if( aURL.Match( aPrefix ) == aPrefix.Len() )
{
if( SvtModuleOptions().IsWriter() )
{
String aPattern( aPrefix );
- aPattern += rtl::OUString("swriter");
+ aPattern += OUString("swriter");
if ( aURL.Match( aPattern ) >= aPattern.Len() )
return aTypeName;
}
@@ -193,24 +192,24 @@ SwFilterDetect::~SwFilterDetect()
sal_Bool bIsStorage = aMedium.IsStorage();
if ( bIsStorage )
{
- 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
// is broken, but we can not handle it in medium since impossibility
// to create a storage does not _always_ means that the medium is broken
- aMedium.SetError( aMedium.GetLastStorageCreationState(), ::rtl::OUString( OSL_LOG_PREFIX ) );
+ aMedium.SetError( aMedium.GetLastStorageCreationState(), OUString( OSL_LOG_PREFIX ) );
if ( xInteraction.is() )
{
OUString empty;
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 );
@@ -228,9 +227,9 @@ SwFilterDetect::~SwFilterDetect()
{
const SfxFilter* pPreFilter = aPreselectedFilterName.Len() ?
SfxFilterMatcher().GetFilter4FilterName( aPreselectedFilterName ) : aTypeName.Len() ?
- SfxFilterMatcher(rtl::OUString("swriter")).GetFilter4EA( aTypeName ) : 0;
+ SfxFilterMatcher(OUString("swriter")).GetFilter4EA( aTypeName ) : 0;
if (!pPreFilter)
- pPreFilter = SfxFilterMatcher(rtl::OUString("sweb")).GetFilter4EA( aTypeName );
+ pPreFilter = SfxFilterMatcher(OUString("sweb")).GetFilter4EA( aTypeName );
OUString aFilterName;
if ( pPreFilter )
{
@@ -240,7 +239,7 @@ SwFilterDetect::~SwFilterDetect()
aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pPreFilter ? pPreFilter->IsOwnTemplateFormat() : sal_False, &aFilterName );
}
- catch (const lang::WrappedTargetException& aWrap)
+ catch (const WrappedTargetException& aWrap)
{
if (!bDeepDetection)
// Bail out early unless it's a deep detection.
@@ -276,16 +275,16 @@ SwFilterDetect::~SwFilterDetect()
NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
xInteraction->handle( aNotifyRequest.GetRequest() );
- rtl::Reference< ::comphelper::OIHWrapNoFilterDialog > xHandler = new ::comphelper::OIHWrapNoFilterDialog( xInteraction );
+ Reference< ::comphelper::OIHWrapNoFilterDialog > xHandler = new ::comphelper::OIHWrapNoFilterDialog( xInteraction );
if ( nIndexOfInteractionHandler != -1 )
- lDescriptor[nIndexOfInteractionHandler].Value <<= uno::Reference< XInteractionHandler >( static_cast< task::XInteractionHandler* >( xHandler.get() ) );
+ lDescriptor[nIndexOfInteractionHandler].Value <<= Reference< XInteractionHandler >( static_cast< XInteractionHandler* >( xHandler.get() ) );
- aMedium.SetError( ERRCODE_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) );
+ aMedium.SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) );
}
}
else
// no interaction, error handling as usual
- aMedium.SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( OSL_LOG_PREFIX ) );
+ aMedium.SetError( ERRCODE_IO_BROKENPACKAGE, OUString( OSL_LOG_PREFIX ) );
if ( !bRepairAllowed )
{
@@ -294,11 +293,11 @@ SwFilterDetect::~SwFilterDetect()
}
}
}
- catch (const uno::RuntimeException&)
+ catch (const RuntimeException&)
{
throw;
}
- catch (const uno::Exception&)
+ catch (const Exception&)
{
aTypeName.Erase();
aPreselectedFilterName.Erase();
@@ -352,7 +351,7 @@ SwFilterDetect::~SwFilterDetect()
{
// if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString("InputStream");
+ lDescriptor[nPropertyCount].Name = OUString("InputStream");
lDescriptor[nPropertyCount].Value <<= xStream;
nPropertyCount++;
}
@@ -361,7 +360,7 @@ SwFilterDetect::~SwFilterDetect()
{
// if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString("UCBContent");
+ lDescriptor[nPropertyCount].Name = OUString("UCBContent");
lDescriptor[nPropertyCount].Value <<= xContent;
nPropertyCount++;
}
@@ -371,7 +370,7 @@ SwFilterDetect::~SwFilterDetect()
if ( nIndexOfReadOnlyFlag == -1 )
{
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString("ReadOnly");
+ lDescriptor[nPropertyCount].Name = OUString("ReadOnly");
lDescriptor[nPropertyCount].Value <<= bReadOnly;
nPropertyCount++;
}
@@ -382,7 +381,7 @@ SwFilterDetect::~SwFilterDetect()
if ( !bRepairPackage && bRepairAllowed )
{
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString("RepairPackage");
+ lDescriptor[nPropertyCount].Name = OUString("RepairPackage");
lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
nPropertyCount++;
bOpenAsTemplate = sal_True;
@@ -394,7 +393,7 @@ SwFilterDetect::~SwFilterDetect()
if ( nIndexOfTemplateFlag == -1 )
{
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString("AsTemplate");
+ lDescriptor[nPropertyCount].Name = OUString("AsTemplate");
lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate;
nPropertyCount++;
}
@@ -408,7 +407,7 @@ SwFilterDetect::~SwFilterDetect()
if ( nIndexOfDocumentTitle == -1 )
{
lDescriptor.realloc( nPropertyCount + 1 );
- lDescriptor[nPropertyCount].Name = ::rtl::OUString("DocumentTitle");
+ lDescriptor[nPropertyCount].Name = OUString("DocumentTitle");
lDescriptor[nPropertyCount].Value <<= aDocumentTitle;
nPropertyCount++;
}
@@ -421,16 +420,16 @@ SwFilterDetect::~SwFilterDetect()
}
/* XServiceInfo */
-rtl::OUString SAL_CALL SwFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
+OUString SAL_CALL SwFilterDetect::getImplementationName() throw( RuntimeException )
{
return impl_getStaticImplementationName();
}
\
/* XServiceInfo */
-sal_Bool SAL_CALL SwFilterDetect::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION )
+sal_Bool SAL_CALL SwFilterDetect::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 )
@@ -442,31 +441,31 @@ sal_Bool SAL_CALL SwFilterDetect::supportsService( const rtl::OUString& sService
}
/* XServiceInfo */
-UNOSEQUENCE< rtl::OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
+Sequence< OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( RuntimeException )
{
return impl_getStaticSupportedServiceNames();
}
/* Helper for XServiceInfo */
-UNOSEQUENCE< rtl::OUString > SwFilterDetect::impl_getStaticSupportedServiceNames()
+Sequence< OUString > SwFilterDetect::impl_getStaticSupportedServiceNames()
{
- UNOSEQUENCE< rtl::OUString > seqServiceNames( 3 );
- seqServiceNames.getArray() [0] = ::rtl::OUString("com.sun.star.frame.ExtendedTypeDetection" );
- seqServiceNames.getArray() [1] = ::rtl::OUString("com.sun.star.text.FormatDetector" );
- seqServiceNames.getArray() [2] = ::rtl::OUString("com.sun.star.text.W4WFormatDetector" );
+ Sequence< OUString > seqServiceNames( 3 );
+ seqServiceNames.getArray() [0] = OUString("com.sun.star.frame.ExtendedTypeDetection" );
+ seqServiceNames.getArray() [1] = OUString("com.sun.star.text.FormatDetector" );
+ seqServiceNames.getArray() [2] = OUString("com.sun.star.text.W4WFormatDetector" );
return seqServiceNames ;
}
/* Helper for XServiceInfo */
-rtl::OUString SwFilterDetect::impl_getStaticImplementationName()
+OUString SwFilterDetect::impl_getStaticImplementationName()
{
- return ::rtl::OUString("com.sun.star.comp.writer.FormatDetector" );
+ return OUString("com.sun.star.comp.writer.FormatDetector" );
}
/* Helper for registry */
-UNOREFERENCE< UNOXINTERFACE > SAL_CALL SwFilterDetect::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION )
+Reference< XInterface > SAL_CALL SwFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception )
{
- return UNOREFERENCE< UNOXINTERFACE >( *new SwFilterDetect( xServiceManager ) );
+ return Reference< XInterface >( *new SwFilterDetect( xServiceManager ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index 2ea42dc..039bf09 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -55,16 +55,12 @@ namespace com
class SfxMedium;
class SfxFilter;
-#define REFERENCE ::com::sun::star::uno::Reference
-#define SEQUENCE ::com::sun::star::uno::Sequence
-#define RUNTIME_EXCEPTION ::com::sun::star::uno::RuntimeException
-
-class SwFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
+class SwFilterDetect : public ::cppu::WeakImplHelper2< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
{
static sal_uLong DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
static sal_uLong GlobDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
public:
- SwFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+ SwFilterDetect( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
virtual ~SwFilterDetect();
SFX_DECL_XSERVICEINFO_NOFACTORY
@@ -72,7 +68,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
diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx
index 895cc5b..815a2bb 100644
--- a/sw/source/ui/uno/unomodule.cxx
+++ b/sw/source/ui/uno/unomodule.cxx
@@ -29,17 +29,17 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-using namespace ::com::sun::star;
+using namespace css;
-::rtl::OUString SAL_CALL SwUnoModule_getImplementationName() throw( uno::RuntimeException )
+OUString SAL_CALL SwUnoModule_getImplementationName() throw( uno::RuntimeException )
{
- return rtl::OUString( "com.sun.star.comp.Writer.WriterModule" );
+ return OUString( "com.sun.star.comp.Writer.WriterModule" );
}
-uno::Sequence< rtl::OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw( uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw( uno::RuntimeException )
{
- uno::Sequence< rtl::OUString > aSeq( 1 );
- aSeq[0] = ::rtl::OUString("com.sun.star.text.ModuleDispatcher");
+ uno::Sequence< OUString > aSeq( 1 );
+ aSeq[0] = OUString("com.sun.star.text.ModuleDispatcher");
return aSeq;
}
@@ -102,11 +102,11 @@ void SAL_CALL SwUnoModule::removeStatusListener(
{
}
-SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SwUnoModule::queryDispatches(
- const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescripts ) throw( uno::RuntimeException )
+uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SwUnoModule::queryDispatches(
+ const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( uno::RuntimeException )
{
sal_Int32 nCount = seqDescripts.getLength();
- SEQUENCE< REFERENCE< XDISPATCH > > lDispatcher( nCount );
+ uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount );
for( sal_Int32 i=0; i<nCount; ++i )
{
@@ -119,31 +119,31 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SwUnoModule::queryDispatches(
}
// XDispatchProvider
-REFERENCE< XDISPATCH > SAL_CALL SwUnoModule::queryDispatch(
- const UNOURL& aURL, const rtl::OUString& /*sTargetFrameName*/,
+uno::Reference< frame::XDispatch > SAL_CALL SwUnoModule::queryDispatch(
+ const util::URL& aURL, const OUString& /*sTargetFrameName*/,
sal_Int32 /*eSearchFlags*/ ) throw( uno::RuntimeException )
{
- REFERENCE< XDISPATCH > xReturn;
+ uno::Reference< frame::XDispatch > xReturn;
SolarMutexGuard aGuard;
SwGlobals::ensure();
const SfxSlot* pSlot = SW_MOD()->GetInterface()->GetSlot( aURL.Complete );
if ( pSlot )
- xReturn = REFERENCE< XDISPATCH >(static_cast< XDISPATCH* >(this), uno::UNO_QUERY);
+ xReturn = uno::Reference< frame::XDispatch >(static_cast< frame::XDispatch* >(this), uno::UNO_QUERY);
return xReturn;
}
// XServiceInfo
-::rtl::OUString SAL_CALL SwUnoModule::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL SwUnoModule::getImplementationName( ) throw(uno::RuntimeException)
{
return SwUnoModule_getImplementationName();
}
-sal_Bool SAL_CALL SwUnoModule::supportsService( const ::rtl::OUString& sServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL SwUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException)
{
- UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
- const rtl::OUString* pArray = seqServiceNames.getConstArray();
+ uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames();
+ const OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{
if ( pArray[nCounter] == sServiceName )
@@ -154,7 +154,7 @@ sal_Bool SAL_CALL SwUnoModule::supportsService( const ::rtl::OUString& sServiceN
return sal_False ;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL SwUnoModule::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL SwUnoModule::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return SwUnoModule_getSupportedServiceNames();
}
diff --git a/sw/source/ui/uno/unomodule.hxx b/sw/source/ui/uno/unomodule.hxx
index c1757a4..63f80f3 100644
--- a/sw/source/ui/uno/unomodule.hxx
+++ b/sw/source/ui/uno/unomodule.hxx
@@ -48,42 +48,32 @@ namespace com
}
}
-#define REFERENCE ::com::sun::star::uno::Reference
-#define SEQUENCE ::com::sun::star::uno::Sequence
-#define RUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException
-#define REFERENCE ::com::sun::star::uno::Reference
-#define SEQUENCE ::com::sun::star::uno::Sequence
-#define XDISPATCH ::com::sun::star::frame::XDispatch
-#define XNOTIFYINGDISPATCH ::com::sun::star::frame::XNotifyingDispatch
-#define UNOURL ::com::sun::star::util::URL
-#define DISPATCHDESCRIPTOR ::com::sun::star::frame::DispatchDescriptor
-
-class SwUnoModule : public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XDispatchProvider, ::com::sun::star::frame::XNotifyingDispatch, ::com::sun::star::lang::XServiceInfo >
+class SwUnoModule : public ::cppu::WeakImplHelper3< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
{
- REFERENCE < ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
+ css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory;
public:
- SwUnoModule( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory )
+ SwUnoModule( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory )
: m_xFactory( xFactory )
{}
// XNotifyingDispatch
- virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException);
// XDispatch
- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException );
+ virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException );
+ virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException );
// XDispatchProvider
- virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ;
- virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch( const UNOURL & aURL ,
+ virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException ) ;
+ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL ,
const ::rtl::OUString & sTargetFrameName,
- sal_Int32 eSearchFlags ) throw( RUNTIMEEXCEPTION ) ;
+ sal_Int32 eSearchFlags ) throw( css::uno::RuntimeException ) ;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException);
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException);
};
#endif
commit 17533a0f77fcaa1da63c3651075bd8d320583d4f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Apr 2 00:21:17 2013 +0200
remove XACC macro
Change-Id: Ide6eb5df56747d7ff1575f9eacd7fa2a9f627ca1
diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 27fb91d..0b3ca19 100644
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
@@ -24,14 +24,12 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-// ============================================================================
namespace svt{ namespace table
{
typedef sal_Int32 RowPos;
-// ============================================================================
enum AccessibleTableType
{
@@ -54,9 +52,6 @@ enum AccessibleTableControlObjType
TCTYPE_COLUMNHEADERCELL, /// A cell of the column header bar.
};
-// ============================================================================
-
-#define XACC ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
/** This abstract class provides methods to implement an accessible table object.
*/
@@ -68,8 +63,8 @@ public:
/** @return The position of the current column. */
virtual sal_Int32 GetCurrentColumn() const = 0;
/** Creates and returns the accessible object of the whole GridControl. */
- virtual XACC CreateAccessible()= 0;
- virtual XACC CreateAccessibleControl( sal_Int32 _nIndex )= 0;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible()= 0;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex )= 0;
virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const= 0;
virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow )= 0;
virtual sal_Bool HasColHeader() = 0;
@@ -93,7 +88,7 @@ public:
// Window
virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
virtual void GrabFocus()= 0;
- virtual XACC GetAccessible( sal_Bool bCreate = sal_True )= 0;
+ virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True )= 0;
virtual Window* GetAccessibleParentWindow() const= 0;
virtual Window* GetWindowInstance()= 0;
virtual sal_Int32 GetAccessibleControlCount() const = 0;
@@ -113,7 +108,7 @@ public:
virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const = 0;
virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0;
virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const = 0;
- virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
+ virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
virtual sal_Int32 GetSelectedRowCount() const = 0;
@@ -126,7 +121,6 @@ protected:
~IAccessibleTable() {}
};
-// ----------------------------------------------------------------------------
/** interface for an implementation of a table control's Accesible component
*/
@@ -140,7 +134,7 @@ public:
The returned reference is guaranteed to not be <NULL/>.
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
getMyself() = 0;
/** disposes the accessible implementation, so that it becomes defunc
@@ -154,12 +148,12 @@ public:
/** returns the accessible object for the row or the column header bar
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
getTableHeader( ::svt::table::AccessibleTableControlObjType _eObjType ) = 0;
/** returns the accessible object for the table representation
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
getTable() = 0;
/** commits the event at all listeners of the cell
@@ -172,8 +166,8 @@ public:
*/
virtual void commitCellEvent(
sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue
) = 0;
/** commits the event at all listeners of the table
@param nEventId
@@ -185,29 +179,25 @@ public:
*/
virtual void commitTableEvent(
sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue
) = 0;
///** Commits an event to all listeners. */
virtual void commitEvent(
sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue
) = 0;
protected:
~IAccessibleTableControl() {}
};
-// ----------------------------------------------------------------------------
-// ============================================================================
} // namespace table
} // namespace svt
-// ============================================================================
-
#endif // _SVTOOLS_ACCESSIBLETABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx
index bb2ef0b..76fc296 100644
--- a/svtools/inc/svtools/accessibletableprovider.hxx
+++ b/svtools/inc/svtools/accessibletableprovider.hxx
@@ -25,18 +25,13 @@
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-// ============================================================================
namespace svt
{
-// ============================================================================
-
#define OFFSET_DEFAULT ((sal_Int32)-1)
#define OFFSET_NONE ((sal_Int32)0)
-// ============================================================================
-
enum AccessibleTableChildIndex
{
/** Child index of the column header bar (first row). Exists always. */
@@ -49,9 +44,6 @@ enum AccessibleTableChildIndex
BBINDEX_FIRSTCONTROL = 3
};
-// ============================================================================
-
-#define XACC ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
/** This abstract class provides methods to implement an accessible table object.
*/
@@ -90,8 +82,8 @@ public:
/** @return <TRUE/>, if the row is selected. */
virtual bool IsRowSelected( long _nRow ) const = 0;
virtual sal_Bool IsColumnSelected( long _nColumnPos ) const = 0;
- virtual void GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const = 0;
- virtual void GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const = 0;
+ virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const = 0;
+ virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const = 0;
/** @return <TRUE/>, if the cell is visible. */
virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
@@ -101,12 +93,12 @@ public:
virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0;
virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True ) = 0;
- virtual XACC CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
- virtual XACC CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0;
- virtual XACC CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) = 0;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) = 0;
virtual sal_Int32 GetAccessibleControlCount() const = 0;
- virtual XACC CreateAccessibleControl( sal_Int32 _nIndex ) = 0;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) = 0;
virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) = 0;
virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint ) = 0;
@@ -121,12 +113,12 @@ public:
virtual void GrabTableFocus() = 0;
// OutputDevice
- virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0;
+ virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0;
// Window
virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0;
virtual void GrabFocus() = 0;
- virtual XACC GetAccessible( sal_Bool bCreate = sal_True ) = 0;
+ virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True ) = 0;
virtual Window* GetAccessibleParentWindow() const = 0;
virtual Window* GetWindowInstance() = 0;
@@ -137,7 +129,6 @@ protected:
~IAccessibleTableProvider() {}
};
-// ----------------------------------------------------------------------------
/** interface for an implementation of a table control's Accesible component
*/
@@ -151,16 +142,16 @@ public:
The returned reference is guaranteed to not be <NULL/>.
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
getMyself() = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
SAL_CALL getAccessibleChild( sal_Int32 nChildIndex )
- throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException ) = 0;
+ throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ) = 0;
/** returns the accessible object for the row or the column header bar
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0;
protected:
@@ -179,7 +170,7 @@ public:
The returned reference is guaranteed to not be <NULL/>.
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
getMyself() = 0;
/** disposes the accessible implementation, so that it becomes defunc
@@ -193,12 +184,12 @@ public:
/** returns the accessible object for the row or the column header bar
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0;
/** returns the accessible object for the table representation
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference< css::accessibility::XAccessible >
getTable() = 0;
/** commits the event at all listeners of the column/row header bar
@@ -211,8 +202,8 @@ public:
*/
virtual void commitHeaderBarEvent(
sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue,
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue,
sal_Bool _bColumnHeaderBar
) = 0;
@@ -226,28 +217,24 @@ public:
*/
virtual void commitTableEvent(
sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue
) = 0;
/** Commits an event to all listeners. */
virtual void commitEvent(
sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue
) = 0;
protected:
~IAccessibleBrowseBox() {}
};
-// ----------------------------------------------------------------------------
-
-// ============================================================================
} // namespace svt
-// ============================================================================
#endif // _SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 8c9b70b..4459d6d 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -304,7 +304,6 @@ private:
DECL_DLLPRIVATE_LINK( StartDragHdl, HeaderBar * );
SVT_DLLPRIVATE long GetFrozenWidth() const;
-//#endif
sal_Bool GoToRow(long nRow, sal_Bool bRowColMove, sal_Bool bDoNotModifySelection = sal_False );
@@ -394,8 +393,8 @@ protected:
sal_Bool IsDropFormatSupported( SotFormatStringId nFormat ); // need this because the base class' IsDropFormatSupported is not const ...
sal_Bool IsDropFormatSupported( SotFormatStringId nFormat ) const;
- sal_Bool IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ); // need this because the base class' IsDropFormatSupported is not const ...
- sal_Bool IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ) const;
+ sal_Bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ); // need this because the base class' IsDropFormatSupported is not const ...
+ sal_Bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ) const;
private:
void* implGetDataFlavors() const;
@@ -608,8 +607,8 @@ public:
the old value
*/
void commitBrowseBoxEvent(sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue);
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue);
/** commitTableEvent commit the event at all listeners of the table
@param nEventId
@@ -620,8 +619,8 @@ public:
the old value
*/
void commitTableEvent(sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue);
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue);
/** fires an AccessibleEvent relative to a header bar AccessibleContext
@@ -633,8 +632,8 @@ public:
the old value
*/
void commitHeaderBarEvent(sal_Int16 nEventId,
- const ::com::sun::star::uno::Any& rNewValue,
- const ::com::sun::star::uno::Any& rOldValue,
+ const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue,
sal_Bool _bColumnHeaderBar
);
@@ -674,8 +673,8 @@ public:
// ACCESSIBILITY ==========================================================
public:
/** Creates and returns the accessible object of the whole BrowseBox. */
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible > CreateAccessible();
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible > CreateAccessible();
// Children ---------------------------------------------------------------
@@ -683,22 +682,22 @@ public:
@param nRow The row index of the cell.
@param nColumnId The column pos of the cell.
@return The XAccessible interface of the specified cell. */
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible >
CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnPos );
/** Creates the accessible object of a row header.
@param nRow The row index of the header.
@return The XAccessible interface of the specified row header. */
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible >
CreateAccessibleRowHeader( sal_Int32 nRow );
/** Creates the accessible object of a column header.
@param nColumnId The column ID of the header.
@return The XAccessible interface of the specified column header. */
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible >
CreateAccessibleColumnHeader( sal_uInt16 nColumnPos );
/** @return The count of additional controls of the control area. */
@@ -707,8 +706,8 @@ public:
/** Creates the accessible object of an additional control.
@param nIndex The 0-based index of the control.
@return The XAccessible interface of the specified control. */
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible >
+ virtual css::uno::Reference<
+ css::accessibility::XAccessible >
CreateAccessibleControl( sal_Int32 nIndex );
// Conversions ------------------------------------------------------------
@@ -795,14 +794,14 @@ public:
virtual sal_Bool IsColumnSelected( long _nColumn ) const;
virtual sal_Int32 GetSelectedRowCount() const;
virtual sal_Int32 GetSelectedColumnCount() const;
- virtual void GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const;
- virtual void GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const;
+ virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const;
+ virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const;
virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
virtual String GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const;
virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const;
virtual void GrabFocus();
- virtual XACC GetAccessible( sal_Bool bCreate = sal_True );
+ virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True );
virtual Window* GetAccessibleParentWindow() const;
virtual Window* GetWindowInstance();
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 683ae56..208a8a7 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -126,7 +126,7 @@ namespace svt {
class SVT_DLLPUBLIC SvHeaderTabListBox : public SvTabListBox, public svt::IAccessibleTableProvider
{
private:
- typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+ typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
sal_Bool m_bFirstPaint;
::svt::SvHeaderTabListBoxImpl* m_pImpl;
@@ -201,8 +201,8 @@ public:
/** @return <TRUE/>, if the row is selected. */
virtual bool IsRowSelected( long _nRow ) const;
virtual sal_Bool IsColumnSelected( long _nColumn ) const;
- virtual void GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const;
- virtual void GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const;
+ virtual void GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) const;
+ virtual void GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& _rColumns ) const;
/** @return <TRUE/>, if the cell is visible. */
virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const;
@@ -212,12 +212,12 @@ public:
virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True );
virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True );
- virtual XACC CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
- virtual XACC CreateAccessibleRowHeader( sal_Int32 _nRow );
- virtual XACC CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos );
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleRowHeader( sal_Int32 _nRow );
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos );
virtual sal_Int32 GetAccessibleControlCount() const;
- virtual XACC CreateAccessibleControl( sal_Int32 _nIndex );
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex );
virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint );
virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_uInt16& _rnColPos, const Point& _rPoint );
@@ -234,16 +234,16 @@ public:
virtual void GrabTableFocus();
// OutputDevice
- virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
+ virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector );
// Window
virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const;
virtual void GrabFocus();
- virtual XACC GetAccessible( sal_Bool bCreate = sal_True );
+ virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True );
virtual Window* GetAccessibleParentWindow() const;
/** Creates and returns the accessible object of the whole BrowseBox. */
- virtual XACC CreateAccessible();
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible();
virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint);
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx
index 16cd8c9..193ac86 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/svtools/inc/svtools/table/tablecontrol.hxx
@@ -150,8 +150,8 @@ namespace svt { namespace table
virtual void StateChanged( StateChangedType i_nStateChange );
/** Creates and returns the accessible object of the whole GridControl. */
- SVT_DLLPRIVATE virtual XACC CreateAccessible();
- SVT_DLLPRIVATE virtual XACC CreateAccessibleControl( sal_Int32 _nIndex );
+ SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible();
+ SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex );
SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const;
SVT_DLLPRIVATE virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow );
SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const;
@@ -161,14 +161,14 @@ namespace svt { namespace table
// Those do not really belong into the public API - they're intended for firing A11Y-related events. However,
// firing those events should be an implementation internal to the TableControl resp. TableControl_Impl,
// instead of something triggered externally.
- void commitCellEventIfAccessibleAlive( sal_Int16 const i_eventID, const ::com::sun::star::uno::Any& i_newValue, const ::com::sun::star::uno::Any& i_oldValue );
- void commitTableEventIfAccessibleAlive( sal_Int16 const i_eventID, const ::com::sun::star::uno::Any& i_newValue, const ::com::sun::star::uno::Any& i_oldValue );
+ void commitCellEventIfAccessibleAlive( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue );
+ void commitTableEventIfAccessibleAlive( sal_Int16 const i_eventID, const css::uno::Any& i_newValue, const css::uno::Any& i_oldValue );
// .............................................................................................................
// IAccessibleTable
virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const;
virtual void GrabFocus();
- virtual XACC GetAccessible( sal_Bool bCreate = sal_True );
+ virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True );
virtual Window* GetAccessibleParentWindow() const;
virtual Window* GetWindowInstance();
virtual sal_Int32 GetAccessibleControlCount() const;
@@ -188,7 +188,7 @@ namespace svt { namespace table
virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const;
virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const;
virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const;
- virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const;
+ virtual css::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const;
virtual sal_Bool HasRowHeader();
virtual sal_Bool HasColHeader();
virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const;
More information about the Libreoffice-commits
mailing list