[Libreoffice-commits] core.git: chart2/source
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Fri Jun 20 19:51:20 PDT 2014
chart2/source/controller/main/ChartController.cxx | 6 +++---
chart2/source/controller/main/ChartController_Position.cxx | 2 +-
chart2/source/controller/main/ChartController_Properties.cxx | 8 ++++----
chart2/source/controller/main/ChartController_TextEdit.cxx | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit fb06300b73b6b9d3794a5c60ecffa7802d821fce
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Sat Jun 21 04:46:14 2014 +0200
fix windows build
Change-Id: I0de216a8c6259ba6ec825f85f52e2f48b97510d7
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 1045ec2..60a276c 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1235,7 +1235,7 @@ void SAL_CALL ChartController::releaseContextMenuInterceptor(
// ____ XEmbeddedClient ____
// implementation see: ChartController_EditData.cxx
-void SAL_CALL ChartController::executeDispatch_ChartType()
+void ChartController::executeDispatch_ChartType()
{
// using assignment for broken gcc 3.3
UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
@@ -1251,7 +1251,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
}
}
-void SAL_CALL ChartController::executeDispatch_SourceData()
+void ChartController::executeDispatch_SourceData()
{
//convert properties to ItemSet
uno::Reference< XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY );
@@ -1273,7 +1273,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
}
}
-void SAL_CALL ChartController::executeDispatch_MoveSeries( bool bForward )
+void ChartController::executeDispatch_MoveSeries( bool bForward )
{
ControllerLockGuardUNO aCLGuard( getModel() );
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 230637b..c28c697 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -108,7 +108,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectang
rPosAndSize = awt::Rectangle(nPosX,nPosY,nSizX,nSizY);
}
-void SAL_CALL ChartController::executeDispatch_PositionAndSize()
+void ChartController::executeDispatch_PositionAndSize()
{
const OUString aCID( m_aSelection.getSelectedCID() );
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index dd2e0fa3..3c1bb9e 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -636,7 +636,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno:
}
// anonymous namespace
-void SAL_CALL ChartController::executeDispatch_FormatObject(const OUString& rDispatchCommand)
+void ChartController::executeDispatch_FormatObject(const OUString& rDispatchCommand)
{
uno::Reference< XChartDocument > xChartDocument( getModel(), uno::UNO_QUERY );
OString aCommand( OUStringToOString( rDispatchCommand, RTL_TEXTENCODING_ASCII_US ) );
@@ -644,7 +644,7 @@ void SAL_CALL ChartController::executeDispatch_FormatObject(const OUString& rDis
executeDlg_ObjectProperties( rObjectCID );
}
-void SAL_CALL ChartController::executeDispatch_ObjectProperties()
+void ChartController::executeDispatch_ObjectProperties()
{
executeDlg_ObjectProperties( m_aSelection.getSelectedCID() );
}
@@ -675,7 +675,7 @@ OUString lcl_getFormatCIDforSelectedCID( const OUString& rSelectedCID )
}//end anonymous namespace
-void SAL_CALL ChartController::executeDlg_ObjectProperties( const OUString& rSelectedObjectCID )
+void ChartController::executeDlg_ObjectProperties( const OUString& rSelectedObjectCID )
{
OUString aObjectCID = lcl_getFormatCIDforSelectedCID( rSelectedObjectCID );
@@ -788,7 +788,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const OUStri
return bRet;
}
-void SAL_CALL ChartController::executeDispatch_View3D()
+void ChartController::executeDispatch_View3D()
{
try
{
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index c9ae457..5ec36e3 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -46,7 +46,7 @@ namespace chart
{
using namespace ::com::sun::star;
-void SAL_CALL ChartController::executeDispatch_EditText( const Point* pMousePixel )
+void ChartController::executeDispatch_EditText( const Point* pMousePixel )
{
this->StartTextEdit( pMousePixel );
}
@@ -145,7 +145,7 @@ bool ChartController::EndTextEdit()
return true;
}
-void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
+void ChartController::executeDispatch_InsertSpecialCharacter()
{
SolarMutexGuard aGuard;
if( !m_pDrawViewWrapper)
More information about the Libreoffice-commits
mailing list