summaryrefslogtreecommitdiff
path: root/xmloff/inc
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/inc')
-rw-r--r--xmloff/inc/animations.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index 935ebf0396f7..6ab3cd903a1e 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -45,7 +45,7 @@ extern const SvXMLEnumMapEntry<sal_Int16> aAnimations_EnumMap_Command[];
struct ImplAttributeNameConversion
{
token::XMLTokenEnum meXMLToken;
- const char* mpAPIName;
+ OUString maAPIName;
};
extern const struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList();
%;'/> -rw-r--r--svx/source/form/fmdmod.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdpage.cxx4
-rw-r--r--svx/source/table/accessiblecell.cxx2
-rw-r--r--svx/source/table/cell.cxx10
-rw-r--r--svx/source/table/propertyset.cxx2
-rw-r--r--svx/source/table/tablecolumn.cxx4
-rw-r--r--svx/source/table/tabledesign.cxx8
-rw-r--r--svx/source/table/tablemodel.cxx2
-rw-r--r--svx/source/table/tablerow.cxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx2
-rw-r--r--svx/source/unodraw/SvxXTextColumns.cxx8
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx2
-rw-r--r--svx/source/unodraw/unomod.cxx10
-rw-r--r--svx/source/unodraw/unopool.cxx4
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshap4.cxx8
-rw-r--r--svx/source/unodraw/unoshape.cxx14
-rw-r--r--svx/source/unodraw/unoshcol.cxx2
-rw-r--r--svx/source/xml/xmleohlp.cxx2
24 files changed, 54 insertions, 58 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index e3116a9762b7..ba8b7fd7f6f8 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -345,7 +345,7 @@ uno::Reference<XAccessible> SAL_CALL
else
throw lang::IndexOutOfBoundsException (
"shape has no child with index " + OUString::number(nIndex),
- static_cast<uno::XWeak*>(this));
+ getXWeak());
return xChild;
}
@@ -534,7 +534,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
if (maShapeTreeInfo.GetViewForwarder() == nullptr)
throw uno::RuntimeException (
"AccessibleShape has no valid view forwarder",
- static_cast<uno::XWeak*>(this));
+ getXWeak());
::Size aPixelSize = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
::Size (aBoundingBox.Width, aBoundingBox.Height));
::Point aPixelPosition = maShapeTreeInfo.GetViewForwarder()->LogicToPixel (
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 989d5b4650cd..c30756804b49 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -302,7 +302,7 @@ void SvxGraphCtrlAccessibleContext::CommitChange (
const uno::Any& rOldValue)
{
AccessibleEventObject aEvent (
- static_cast<uno::XWeak*>(this),
+ getXWeak(),
nEventId,
rNewValue,
rOldValue, -1);
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 5fe9c608bbbd..d7fe7c9c23dd 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -391,7 +391,7 @@ void SAL_CALL FmXGridControl::dispose()
SolarMutexGuard aGuard;
EventObject aEvt;
- aEvt.Source = static_cast< ::cppu::OWeakObject* >(this);
+ aEvt.Source = getXWeak();
m_aModifyListeners.disposeAndClear(aEvt);
m_aUpdateListeners.disposeAndClear(aEvt);
m_aContainerListeners.disposeAndClear(aEvt);
@@ -1022,7 +1022,7 @@ void FmXGridPeer::selectionChanged()
{
std::unique_lock g(m_aMutex);
EventObject aSource;
- aSource.Source = static_cast< ::cppu::OWeakObject* >(this);
+ aSource.Source = getXWeak();
m_aSelectionListeners.notifyEach( g, &XSelectionChangeListener::selectionChanged, aSource);
}
@@ -1313,7 +1313,7 @@ void FmXGridPeer::CellModified()
{
std::unique_lock g(m_aMutex);
EventObject aEvt;
- aEvt.Source = static_cast< ::cppu::OWeakObject* >(this);
+ aEvt.Source = getXWeak();
m_aModifyListeners.notifyEach( g, &XModifyListener::modified, aEvt );
}
@@ -1452,7 +1452,7 @@ sal_Bool FmXGridPeer::commit()
return true;
std::unique_lock g(m_aMutex);
- EventObject aEvt(static_cast< ::cppu::OWeakObject* >(this));
+ EventObject aEvt(getXWeak());
::comphelper::OInterfaceIteratorHelper4 aIter(g, m_aUpdateListeners);
bool bCancel = false;
while (aIter.hasMoreElements() && !bCancel)
@@ -2042,7 +2042,7 @@ void FmXGridPeer::dispose()
{
std::unique_lock g(m_aMutex);
EventObject aEvt;
- aEvt.Source = static_cast< ::cppu::OWeakObject* >(this);
+ aEvt.Source = getXWeak();
m_aModifyListeners.disposeAndClear(g, aEvt);
m_aUpdateListeners.disposeAndClear(g, aEvt);
m_aContainerListeners.disposeAndClear(g, aEvt);
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 415e016eeedf..56aa46447a20 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -44,7 +44,7 @@ using namespace ::svxform;
{
SdrModel& rTargetModel(getSdrModelFromUnoModel());
rtl::Reference<SdrObject> pObj = new FmFormObj(rTargetModel);
- xRet = static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new SvxShapeControl(pObj.get())));
+ xRet = getXWeak(new SvxShapeControl(pObj.get()));
}
if (!xRet.is())
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx