[Libreoffice-commits] .: bridges/source bridges/test chart2/source cli_ure/source cppuhelper/source cppuhelper/test cui/source dtrans/source editeng/source extensions/source extensions/test filter/source forms/source i18npool/source javaunohelper/source jvmaccess/workbench jvmfwk/plugins lingucomponent/source linguistic/inc linguistic/source linguistic/workben sccomp/source scripting/source sdext/source slideshow/source stoc/source stoc/test svtools/source svx/source sw/source testtools/source ucb/source unotools/source xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 30 04:55:02 PST 2013
bridges/source/jni_uno/jni_base.h | 6
bridges/source/jni_uno/jni_bridge.cxx | 16
bridges/source/jni_uno/jni_info.h | 2
bridges/source/jni_uno/jni_java2uno.cxx | 8
bridges/source/jni_uno/jni_uno2java.cxx | 12
bridges/test/inter_libs_exc/inter.cxx | 8
bridges/test/inter_libs_exc/share.h | 2
bridges/test/inter_libs_exc/thrower.cxx | 2
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 1
chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx | 8
chart2/source/controller/main/ChartController_Insert.cxx | 13
chart2/source/controller/main/ChartController_Properties.cxx | 13
chart2/source/controller/main/ChartController_TextEdit.cxx | 4
chart2/source/controller/main/ChartController_Tools.cxx | 58 -
chart2/source/controller/main/ChartController_Window.cxx | 204 +++---
chart2/source/controller/main/ChartFrameloader.cxx | 2
chart2/source/controller/main/CommandDispatchContainer.cxx | 16
chart2/source/controller/main/ConfigurationAccess.cxx | 6
chart2/source/controller/main/ControllerCommandDispatch.cxx | 236 +++---
chart2/source/controller/main/DragMethod_PieSegment.cxx | 2
chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 2
chart2/source/controller/main/DrawCommandDispatch.cxx | 2
chart2/source/controller/main/ElementSelector.cxx | 2
chart2/source/controller/main/ObjectHierarchy.cxx | 16
chart2/source/controller/main/PositionAndSizeHelper.cxx | 16
chart2/source/controller/main/SelectionHelper.cxx | 7
chart2/source/controller/main/StatusBarCommandDispatch.cxx | 6
chart2/source/controller/main/UndoCommandDispatch.cxx | 4
chart2/source/inc/macros.hxx | 2
chart2/source/model/filter/XMLFilter.cxx | 72 +-
chart2/source/model/main/Axis.cxx | 34 -
chart2/source/model/main/BaseCoordinateSystem.cxx | 4
chart2/source/model/main/CartesianCoordinateSystem.cxx | 2
chart2/source/model/main/ChartModel.cxx | 36 -
chart2/source/model/main/ChartModel_Persistence.cxx | 52 -
chart2/source/model/main/DataPoint.cxx | 8
chart2/source/model/main/DataPointProperties.cxx | 84 +-
chart2/source/model/main/DataSeries.cxx | 12
chart2/source/model/main/DataSeriesProperties.cxx | 8
chart2/source/model/main/Diagram.cxx | 40 -
chart2/source/model/main/FormattedString.cxx | 6
chart2/source/model/main/GridProperties.cxx | 6
chart2/source/model/main/Legend.cxx | 24
chart2/source/model/main/PageBackground.cxx | 4
chart2/source/model/main/PolarCoordinateSystem.cxx | 2
chart2/source/model/main/StockBar.cxx | 4
chart2/source/model/main/Title.cxx | 30
chart2/source/model/main/Wall.cxx | 4
chart2/source/model/template/AreaChartType.cxx | 4
chart2/source/model/template/AreaChartTypeTemplate.cxx | 10
chart2/source/model/template/BarChartType.cxx | 4
chart2/source/model/template/BarChartTypeTemplate.cxx | 16
chart2/source/model/template/BubbleChartType.cxx | 16
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 4
chart2/source/model/template/BubbleDataInterpreter.cxx | 22
chart2/source/model/template/CandleStickChartType.cxx | 34 -
chart2/source/model/template/ChartType.cxx | 8
chart2/source/model/template/ChartTypeManager.cxx | 140 ++--
chart2/source/model/template/ChartTypeTemplate.cxx | 40 -
chart2/source/model/template/ColumnChartType.cxx | 8
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 6
chart2/source/model/template/DataInterpreter.cxx | 30
chart2/source/model/template/FilledNetChartType.cxx | 6
chart2/source/model/template/LineChartType.cxx | 12
chart2/source/model/template/LineChartTypeTemplate.cxx | 30
chart2/source/model/template/NetChartType.cxx | 8
chart2/source/model/template/NetChartTypeTemplate.cxx | 6
chart2/source/model/template/PieChartType.cxx | 8
chart2/source/model/template/PieChartTypeTemplate.cxx | 36 -
chart2/source/model/template/ScatterChartType.cxx | 18
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 32
chart2/source/model/template/StockChartTypeTemplate.cxx | 30
chart2/source/model/template/StockDataInterpreter.cxx | 18
chart2/source/model/template/XYDataInterpreter.cxx | 16
chart2/source/tools/AxisHelper.cxx | 38 -
chart2/source/tools/CachedDataSequence.cxx | 10
chart2/source/tools/CharacterProperties.cxx | 120 +--
chart2/source/tools/ChartModelHelper.cxx | 12
chart2/source/tools/ChartTypeHelper.cxx | 10
chart2/source/tools/ColorPerPointHelper.cxx | 4
chart2/source/tools/ConfigColorScheme.cxx | 6
chart2/source/tools/DataSeriesHelper.cxx | 58 -
chart2/source/tools/DataSourceHelper.cxx | 18
chart2/source/tools/DiagramHelper.cxx | 50 -
chart2/source/tools/ErrorBar.cxx | 14
chart2/source/tools/ExplicitCategoriesProvider.cxx | 4
chart2/source/tools/ExponentialRegressionCurveCalculator.cxx | 18
chart2/source/tools/FillProperties.cxx | 36 -
chart2/source/tools/FormattedStringHelper.cxx | 2
chart2/source/tools/InternalData.cxx | 4
chart2/source/tools/InternalDataProvider.cxx | 14
chart2/source/tools/LabeledDataSequence.cxx | 4
chart2/source/tools/LegendHelper.cxx | 20
chart2/source/tools/LineProperties.cxx | 30
chart2/source/tools/LinearRegressionCurveCalculator.cxx | 2
chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx | 2
chart2/source/tools/ObjectIdentifier.cxx | 164 ++--
chart2/source/tools/PotentialRegressionCurveCalculator.cxx | 2
chart2/source/tools/PropertyHelper.cxx | 20
chart2/source/tools/RangeHighlighter.cxx | 2
chart2/source/tools/ReferenceSizeProvider.cxx | 6
chart2/source/tools/RegressionCurveHelper.cxx | 30
chart2/source/tools/RegressionCurveModel.cxx | 32
chart2/source/tools/RegressionEquation.cxx | 18
chart2/source/tools/SceneProperties.cxx | 66 -
chart2/source/tools/StatisticsHelper.cxx | 18
chart2/source/tools/ThreeDHelper.cxx | 96 +-
chart2/source/tools/TitleHelper.cxx | 16
chart2/source/tools/UncachedDataSequence.cxx | 12
chart2/source/tools/UserDefinedProperties.cxx | 8
chart2/source/tools/WrappedIgnoreProperty.cxx | 56 -
chart2/source/view/axes/VAxisBase.cxx | 4
chart2/source/view/axes/VAxisProperties.cxx | 24
chart2/source/view/axes/VCartesianAxis.cxx | 6
chart2/source/view/axes/VCartesianGrid.cxx | 2
chart2/source/view/axes/VCoordinateSystem.cxx | 2
chart2/source/view/axes/VPolarAngleAxis.cxx | 4
chart2/source/view/axes/VPolarGrid.cxx | 4
chart2/source/view/charttypes/BarChart.cxx | 8
chart2/source/view/charttypes/BubbleChart.cxx | 2
chart2/source/view/charttypes/CandleStickChart.cxx | 12
chart2/source/view/charttypes/PieChart.cxx | 14
chart2/source/view/charttypes/VSeriesPlotter.cxx | 48 -
chart2/source/view/diagram/VDiagram.cxx | 144 ++--
chart2/source/view/main/ChartItemPool.cxx | 2
chart2/source/view/main/ChartView.cxx | 130 +--
chart2/source/view/main/DataPointSymbolSupplier.cxx | 4
chart2/source/view/main/LabelPositionHelper.cxx | 12
chart2/source/view/main/PropertyMapper.cxx | 38 -
chart2/source/view/main/ShapeFactory.cxx | 176 ++---
chart2/source/view/main/VLegend.cxx | 52 -
chart2/source/view/main/VLegendSymbolFactory.cxx | 12
chart2/source/view/main/VLineProperties.cxx | 20
chart2/source/view/main/VTitle.cxx | 36 -
cli_ure/source/climaker/climaker_app.cxx | 60 -
cli_ure/source/climaker/climaker_emit.cxx | 18
cli_ure/source/climaker/climaker_share.h | 2
cli_ure/source/native/native_share.h | 10
cli_ure/source/uno_bridge/cli_base.h | 6
cli_ure/source/uno_bridge/cli_bridge.cxx | 6
cli_ure/source/uno_bridge/cli_data.cxx | 6
cli_ure/source/uno_bridge/cli_proxy.cxx | 6
cppuhelper/source/access_control.cxx | 10
cppuhelper/source/bootstrap.cxx | 43 -
cppuhelper/source/component_context.cxx | 21
cppuhelper/source/exc_thrower.cxx | 22
cppuhelper/source/factory.cxx | 8
cppuhelper/source/macro_expander.cxx | 7
cppuhelper/source/shlib.cxx | 60 -
cppuhelper/test/cfg_test.cxx | 32
cui/source/options/optsave.cxx | 7
dtrans/source/win32/ftransl/ftransl.cxx | 11
editeng/source/editeng/textconv.cxx | 6
editeng/source/misc/unolingu.cxx | 10
extensions/source/nsplugin/source/so_main.cxx | 10
extensions/source/ole/ole2uno.hxx | 1
extensions/source/ole/oleobjw.cxx | 243 +++----
extensions/source/ole/unoconversionutilities.hxx | 204 +++---
extensions/source/ole/unoobjw.cxx | 48 -
extensions/test/ole/OleClient/clientTest.cxx | 11
filter/source/msfilter/msocximex.cxx | 8
filter/source/svg/svgexport.cxx | 339 ++++------
filter/source/svg/svgfontexport.cxx | 12
filter/source/svg/svgwriter.cxx | 309 +++------
filter/source/svg/svgwriter.hxx | 5
forms/source/xforms/binding.cxx | 29
forms/source/xforms/computedexpression.cxx | 8
forms/source/xforms/convert.cxx | 4
forms/source/xforms/model.cxx | 2
forms/source/xforms/model_helper.hxx | 2
forms/source/xforms/model_ui.cxx | 40 -
forms/source/xforms/pathexpression.cxx | 2
forms/source/xforms/resourcehelper.cxx | 12
forms/source/xforms/submission.cxx | 14
forms/source/xforms/unohelper.hxx | 2
i18npool/source/localedata/localedata.cxx | 43 -
javaunohelper/source/bootstrap.cxx | 12
javaunohelper/source/javaunohelper.cxx | 6
javaunohelper/source/preload.cxx | 12
jvmaccess/workbench/javainfo/javainfotest.cxx | 96 +-
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 73 +-
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 7
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 66 +
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 12
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx | 2
lingucomponent/source/languageguessing/guesslang.cxx | 26
lingucomponent/source/lingutil/lingutil.cxx | 28
lingucomponent/source/lingutil/lingutil.hxx | 4
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 2
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 16
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 32
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 2
linguistic/inc/linguistic/misc.hxx | 3
linguistic/source/convdic.hxx | 2
linguistic/source/convdiclist.hxx | 2
linguistic/source/convdicxml.cxx | 16
linguistic/source/dicimp.cxx | 2
linguistic/source/dlistimp.cxx | 4
linguistic/source/dlistimp.hxx | 2
linguistic/source/hhconvdic.cxx | 4
linguistic/source/hhconvdic.hxx | 2
linguistic/source/lngopt.cxx | 2
linguistic/source/lngopt.hxx | 2
linguistic/source/lngsvcmgr.hxx | 2
linguistic/source/misc.cxx | 4
linguistic/source/misc2.cxx | 6
linguistic/workben/sprophelp.cxx | 14
linguistic/workben/sspellimp.cxx | 12
sccomp/source/solver/solver.cxx | 12
scripting/source/basprov/basprov.cxx | 6
scripting/source/inc/util/MiscUtils.hxx | 4
scripting/source/inc/util/util.hxx | 2
scripting/source/protocolhandler/scripthandler.cxx | 6
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 4
scripting/source/provider/MasterScriptProvider.cxx | 78 +-
scripting/source/provider/ProviderCache.cxx | 6
scripting/source/provider/ScriptImpl.cxx | 10
sdext/source/presenter/PresenterAccessibility.cxx | 20
sdext/source/presenter/PresenterBitmapContainer.cxx | 38 -
sdext/source/presenter/PresenterButton.cxx | 20
sdext/source/presenter/PresenterConfigurationAccess.cxx | 14
sdext/source/presenter/PresenterController.cxx | 28
sdext/source/presenter/PresenterFrameworkObserver.cxx | 6
sdext/source/presenter/PresenterHelpView.cxx | 16
sdext/source/presenter/PresenterNotesView.cxx | 16
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 22
sdext/source/presenter/PresenterProtocolHandler.cxx | 28
sdext/source/presenter/PresenterScreen.cxx | 10
sdext/source/presenter/PresenterScrollBar.cxx | 18
sdext/source/presenter/PresenterSlideShowView.cxx | 13
sdext/source/presenter/PresenterSlideSorter.cxx | 40 -
sdext/source/presenter/PresenterTextView.cxx | 10
sdext/source/presenter/PresenterTheme.cxx | 88 +-
sdext/source/presenter/PresenterTimer.cxx | 4
sdext/source/presenter/PresenterToolBar.cxx | 42 -
sdext/source/presenter/PresenterViewFactory.cxx | 14
sdext/source/presenter/PresenterWindowManager.cxx | 10
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 16
slideshow/source/engine/shapes/drawshape.cxx | 2
slideshow/source/engine/shapes/gdimtftools.cxx | 18
slideshow/source/engine/shapes/shapeimporter.cxx | 32
slideshow/source/engine/slideshowimpl.cxx | 20
slideshow/source/inc/tools.hxx | 2
stoc/source/implementationregistration/implreg.cxx | 24
stoc/source/implementationregistration/mergekeys.cxx | 8
stoc/source/invocation_adapterfactory/iafactory.cxx | 24
stoc/source/javavm/javavm.cxx | 11
stoc/source/loader/dllcomponentloader.cxx | 4
stoc/source/proxy_factory/proxyfac.cxx | 9
stoc/source/security/access_controller.cxx | 35 -
stoc/source/security/file_policy.cxx | 29
stoc/source/security/permissions.cxx | 6
stoc/source/servicemanager/servicemanager.cxx | 14
stoc/source/tdmanager/tdmgr.cxx | 10
stoc/source/tdmanager/tdmgr_check.cxx | 78 +-
stoc/source/tdmanager/tdmgr_common.hxx | 1
stoc/test/javavm/jvm_interaction/interactionhandler.cxx | 3
svtools/source/config/colorcfg.cxx | 22
svtools/source/config/fontsubstconfig.cxx | 30
svtools/source/config/htmlcfg.cxx | 6
svtools/source/misc/bindablecontrolhelper.cxx | 26
svx/source/dialog/langbox.cxx | 6
svx/source/dialog/rubydialog.cxx | 18
svx/source/dialog/svxbmpnumvalueset.cxx | 6
svx/source/smarttags/SmartTagMgr.cxx | 26
svx/source/table/accessibletableshape.cxx | 4
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 8
sw/source/ui/lingu/olmenu.cxx | 2
testtools/source/bridgetest/bridgetest.cxx | 19
ucb/source/ucp/expand/ucpexpand.cxx | 15
unotools/source/config/lingucfg.cxx | 13
xmlsecurity/source/component/documentdigitalsignatures.cxx | 8
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 8
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 6
276 files changed, 3283 insertions(+), 3497 deletions(-)
New commits:
commit 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53
Author: Jean-Noël Rouvignac <jn.rouvignac at gmail.com>
Date: Wed Jan 30 11:44:23 2013 +0100
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak at suse.cz>
Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index ad0fd8d..7b668c1 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -41,8 +41,6 @@ typedef __va_list va_list;
#include "uno/environment.h"
#include "typelib/typedescription.h"
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
namespace jni_uno
{
@@ -244,7 +242,7 @@ inline ::std::auto_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
{
void * p = rtl_allocateMemory( bytes );
if (0 == p)
- throw BridgeRuntimeError( OUSTR("out of memory!") );
+ throw BridgeRuntimeError( "out of memory!" );
return ::std::auto_ptr< rtl_mem >( (rtl_mem *)p );
}
@@ -274,7 +272,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
if (0 == m_td)
{
throw BridgeRuntimeError(
- OUSTR("cannot get comprehensive type description for ") +
+ "cannot get comprehensive type description for " +
::rtl::OUString::unacquired( &td_ref->pTypeName ) );
}
}
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index 4ba0f7b..a8bef0c 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -102,7 +102,7 @@ void SAL_CALL Mapping_map_to_uno(
#if OSL_DEBUG_LEVEL > 0
OString cstr_msg(
OUStringToOString(
- OUSTR("[jni_uno bridge error] ") + err.m_message,
+ "[jni_uno bridge error] " + err.m_message,
RTL_TEXTENCODING_ASCII_US ) );
OSL_FAIL( cstr_msg.getStr() );
#else
@@ -171,7 +171,7 @@ void SAL_CALL Mapping_map_to_java(
#if OSL_DEBUG_LEVEL > 0
OString cstr_msg(
OUStringToOString(
- OUSTR("[jni_uno bridge error] ") + err.m_message,
+ "[jni_uno bridge error] " + err.m_message,
RTL_TEXTENCODING_ASCII_US ) );
OSL_FAIL( cstr_msg.getStr() );
#else
@@ -289,7 +289,7 @@ void JNI_context::java_exc_occurred() const
if (! jo_exc.is())
{
throw BridgeRuntimeError(
- OUSTR("java exception occurred, but not available!?") +
+ "java exception occurred, but not available!?" +
get_stack_trace() );
}
@@ -299,7 +299,7 @@ void JNI_context::java_exc_occurred() const
{
m_env->ExceptionClear();
throw BridgeRuntimeError(
- OUSTR("cannot get class java.lang.Object!") + get_stack_trace() );
+ "cannot get class java.lang.Object!" + get_stack_trace() );
}
JLocalAutoRef jo_Object( *this, jo_class );
// method Object.toString()
@@ -309,7 +309,7 @@ void JNI_context::java_exc_occurred() const
{
m_env->ExceptionClear();
throw BridgeRuntimeError(
- OUSTR("cannot get method id of java.lang.Object.toString()!") +
+ "cannot get method id of java.lang.Object.toString()!" +
get_stack_trace() );
}
OSL_ASSERT( 0 != method_Object_toString );
@@ -321,7 +321,7 @@ void JNI_context::java_exc_occurred() const
{
m_env->ExceptionClear();
throw BridgeRuntimeError(
- OUSTR("error examining java exception object!") +
+ "error examining java exception object!" +
get_stack_trace() );
}
@@ -337,7 +337,7 @@ void JNI_context::java_exc_occurred() const
{
m_env->ExceptionClear();
throw BridgeRuntimeError(
- OUSTR("invalid java string object!") + get_stack_trace() );
+ "invalid java string object!" + get_stack_trace() );
}
ustr->refCount = 1;
ustr->length = len;
@@ -535,7 +535,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping(
#if OSL_DEBUG_LEVEL > 0
OString cstr_msg(
OUStringToOString(
- OUSTR("[jni_uno bridge error] ") + err.m_message,
+ "[jni_uno bridge error] " + err.m_message,
RTL_TEXTENCODING_ASCII_US ) );
OSL_FAIL( cstr_msg.getStr() );
#else
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index b02bb88..de63914 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -356,7 +356,7 @@ inline void JNI_info::append_sig(
break;
default:
throw BridgeRuntimeError(
- OUSTR("unsupported type: ") +
+ "unsupported type: " +
::rtl::OUString::unacquired( &type->pTypeName ) );
}
}
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 589cd75..9107cc7 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -145,7 +145,7 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const
else
{
OUString message(
- OUSTR("thrown exception is no uno exception: ") +
+ "thrown exception is no uno exception: " +
OUString::unacquired( &uno_exc->pType->pTypeName ) +
jni.get_stack_trace() );
uno_any_destruct( uno_exc, 0 );
@@ -433,7 +433,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
if (! jo_type_name.is())
{
throw BridgeRuntimeError(
- OUSTR("incomplete type object: no type name!") +
+ "incomplete type object: no type name!" +
jni.get_stack_trace() );
}
OUString type_name(
@@ -443,7 +443,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
if (typelib_TypeClass_INTERFACE != info->m_td.get()->eTypeClass)
{
throw BridgeRuntimeError(
- OUSTR("queryInterface() call demands an INTERFACE type!") );
+ "queryInterface() call demands an INTERFACE type!" );
}
JNI_interface_type_info const * iface_info =
static_cast< JNI_interface_type_info const * >( info );
@@ -674,7 +674,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
OUString oid( jstring_to_oustring( jni, (jstring) jo_oid.get() ) );
OString cstr_msg(
OUStringToOString(
- OUSTR("freeing java uno proxy: ") + oid,
+ "freeing java uno proxy: " + oid,
RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", cstr_msg.getStr() );
}
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index b6e3745..88922ca 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -67,7 +67,7 @@ void Bridge::handle_java_exc(
if (! jo_exc.is())
{
throw BridgeRuntimeError(
- OUSTR("java exception occurred, but no java exception available!?") +
+ "java exception occurred, but no java exception available!?" +
jni.get_stack_trace() );
}
@@ -547,7 +547,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
#if OSL_DEBUG_LEVEL > 1
OString cstr_msg(
OUStringToOString(
- OUSTR("freeing binary uno proxy: ") + that->m_oid,
+ "freeing binary uno proxy: " + that->m_oid,
RTL_TEXTENCODING_ASCII_US ) );
OSL_TRACE( "%s", cstr_msg.getStr() );
#endif
@@ -699,8 +699,7 @@ void SAL_CALL UNO_proxy_dispatch(
demanded_td.get()->eTypeClass)
{
throw BridgeRuntimeError(
- OUSTR("queryInterface() call demands "
- "an INTERFACE type!") );
+ "queryInterface() call demands an INTERFACE type!" );
}
uno_Interface * pInterface = 0;
@@ -809,7 +808,7 @@ void SAL_CALL UNO_proxy_dispatch(
default:
{
throw BridgeRuntimeError(
- OUSTR("illegal member type description!") );
+ "illegal member type description!" );
}
}
}
@@ -846,8 +845,7 @@ void SAL_CALL UNO_proxy_dispatch(
{
// binary identical struct
::com::sun::star::uno::RuntimeException exc(
- OUSTR("[jni_uno bridge error] attaching current thread "
- "to java failed!"),
+ "[jni_uno bridge error] attaching current thread to java failed!",
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >() );
::com::sun::star::uno::Type const & exc_type = ::getCppuType( &exc );
diff --git a/bridges/test/inter_libs_exc/inter.cxx b/bridges/test/inter_libs_exc/inter.cxx
index fe60c8c..3c1190d 100644
--- a/bridges/test/inter_libs_exc/inter.cxx
+++ b/bridges/test/inter_libs_exc/inter.cxx
@@ -35,18 +35,18 @@ extern "C" int main( int argc, char const * argv [] )
#define SAL_DLLPREFIX ""
#endif
Module mod_starter(
- OUSTR(SAL_DLLPREFIX "starter" SAL_DLLEXTENSION),
+ SAL_DLLPREFIX "starter" SAL_DLLEXTENSION,
SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
Module mod_thrower(
- OUSTR(SAL_DLLPREFIX "thrower" SAL_DLLEXTENSION),
+ SAL_DLLPREFIX "thrower" SAL_DLLEXTENSION,
SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
typedef t_throws_exc (SAL_CALL * t_get_thrower)();
- t_get_thrower get_thrower = (t_get_thrower)mod_thrower.getSymbol( OUSTR("get_thrower") );
+ t_get_thrower get_thrower = (t_get_thrower)mod_thrower.getSymbol( "get_thrower" );
t_throws_exc thrower = (*get_thrower)();
typedef void (SAL_CALL * t_starter)( t_throws_exc );
- t_starter start = (t_starter)mod_starter.getSymbol( OUSTR("start") );
+ t_starter start = (t_starter)mod_starter.getSymbol( "start" );
(*start)( thrower );
diff --git a/bridges/test/inter_libs_exc/share.h b/bridges/test/inter_libs_exc/share.h
index fffa41b..260883d 100644
--- a/bridges/test/inter_libs_exc/share.h
+++ b/bridges/test/inter_libs_exc/share.h
@@ -20,8 +20,6 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/uno/DeploymentException.hpp>
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
typedef void (SAL_CALL * t_throws_exc)();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/inter_libs_exc/thrower.cxx b/bridges/test/inter_libs_exc/thrower.cxx
index 5f42f4a..de37e1d 100644
--- a/bridges/test/inter_libs_exc/thrower.cxx
+++ b/bridges/test/inter_libs_exc/thrower.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star::uno;
static void SAL_CALL throws_exc()
{
throw lang::IllegalArgumentException(
- OUSTR("bla"), Reference< XInterface >(), 0 );
+ "bla", Reference< XInterface >(), 0 );
}
extern "C" t_throws_exc SAL_CALL get_thrower()
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index d51b5a5..13d5316 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -68,7 +68,6 @@ void Chart2ModelContact::setModel( const ::com::sun::star::uno::Reference<
uno::Reference< container::XNameContainer > xHatchTable( xTableFactory->createInstance("com.sun.star.drawing.HatchTable"), uno::UNO_QUERY );
uno::Reference< container::XNameContainer > xBitmapTable( xTableFactory->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY );
uno::Reference< container::XNameContainer > xTransparencyGradientTable( xTableFactory->createInstance("com.sun.star.drawing.TransparencyGradientTable"), uno::UNO_QUERY );
- //C2U( "com.sun.star.drawing.MarkerTable" )
m_aTableMap["LineDashName"] = xDashTable;
m_aTableMap["FillGradientName"] = xGradientTable;
m_aTableMap["FillHatchName"] = xHatchTable;
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index f10fb41..f813eb2 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -65,7 +65,7 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
GraphicPropertyItemConverter::LINE_AND_FILL_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter(
- rPropertySet, rItemPool, pRefSize, C2U("ReferencePageSize")));
+ rPropertySet, rItemPool, pRefSize, "ReferencePageSize"));
}
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -126,9 +126,9 @@ bool RegressionEquationItemConverter::ApplySpecialItem(
uno::Any aValue( static_cast< sal_Int32 >(
static_cast< const SfxUInt32Item & >(
rItemSet.Get( nWhichId )).GetValue()));
- if( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) != aValue )
+ if( GetPropertySet()->getPropertyValue( "NumberFormat" ) != aValue )
{
- GetPropertySet()->setPropertyValue( C2U( "NumberFormat" ), aValue );
+ GetPropertySet()->setPropertyValue( "NumberFormat", aValue );
bChanged = true;
}
}
@@ -147,7 +147,7 @@ void RegressionEquationItemConverter::FillSpecialItem(
case SID_ATTR_NUMBERFORMAT_VALUE:
{
sal_Int32 nFormatKey = 0;
- if( GetPropertySet()->getPropertyValue( C2U( "NumberFormat" )) >>= nFormatKey )
+ if( GetPropertySet()->getPropertyValue( "NumberFormat" ) >>= nFormatKey )
{
rOutItemSet.Put( SfxUInt32Item( nWhichId, nFormatKey ));
}
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index d257a7d..cd42430 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -281,9 +281,8 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
// add labels
DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries );
- rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
- aChildParticle+=(C2U("="));
- rtl::OUString aObjectCID = ObjectIdentifier::createClassifiedIdentifierForParticles(
+ OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" );
+ OUString aObjectCID = ObjectIdentifier::createClassifiedIdentifierForParticles(
ObjectIdentifier::getSeriesParticleFromCID(m_aSelection.getSelectedCID()), aChildParticle );
bool bSuccess = ChartController::executeDlg_ObjectProperties_withoutUndoGuard( aObjectCID, true );
@@ -585,8 +584,8 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 )
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
m_xUndoManager );
- xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( true ));
- xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( bInsertR2 ));
+ xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( true ));
+ xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bInsertR2 ));
aUndoGuard.commit();
}
}
@@ -602,7 +601,7 @@ void ChartController::executeDispatch_InsertR2Value()
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
m_xUndoManager );
- xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( true ));
+ xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( true ));
aUndoGuard.commit();
}
}
@@ -617,7 +616,7 @@ void ChartController::executeDispatch_DeleteR2Value()
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::INSERT, String( SchResId( STR_OBJECT_CURVE_EQUATION ))),
m_xUndoManager );
- xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( false ));
+ xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false ));
aUndoGuard.commit();
}
}
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 0f31720..d78a5d7 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -97,7 +97,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
}
rtl::OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID );
- bool bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS"));
+ bool bAffectsMultipleObjects = aParticleID == "ALLELEMENTS";
//-------------------------------------------------------------
if( !bAffectsMultipleObjects )
{
@@ -211,7 +211,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
uno::Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY );
bool bVaryColorsByPoint = false;
if( xSeriesProp.is() &&
- (xSeriesProp->getPropertyValue(C2U("VaryColorsByPoint")) >>= bVaryColorsByPoint) &&
+ (xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint) &&
bVaryColorsByPoint )
{
if( !ColorPerPointHelper::hasPointOwnColor( xSeriesProp, nPointIndex, xObjectProperties ) )
@@ -320,7 +320,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel > & xChartModel )
{
if( rDispatchCommand.equals("AllTitles"))
- return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, C2U("ALLELEMENTS") );
+ return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_TITLE, "ALLELEMENTS" );
TitleHelper::eTitleType nTitleType( TitleHelper::MAIN_TITLE );
if( rDispatchCommand.equals("SubTitle") )
@@ -343,7 +343,7 @@ rtl::OUString lcl_getTitleCIDForCommand( const ::rtl::OString& rDispatchCommand,
rtl::OUString lcl_getAxisCIDForCommand( const ::rtl::OString& rDispatchCommand, const uno::Reference< frame::XModel >& xChartModel )
{
if( rDispatchCommand.equals("DiagramAxisAll"))
- return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, C2U("ALLELEMENTS") );
+ return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_AXIS, "ALLELEMENTS" );
sal_Int32 nDimensionIndex=0;
bool bMainAxis=true;
@@ -378,7 +378,7 @@ rtl::OUString lcl_getGridCIDForCommand( const ::rtl::OString& rDispatchCommand,
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
if( rDispatchCommand.equals("DiagramGridAll"))
- return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_GRID, C2U("ALLELEMENTS") );
+ return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_GRID, "ALLELEMENTS" );
sal_Int32 nDimensionIndex=0;
bool bMainGrid=true;
@@ -537,8 +537,7 @@ rtl::OUString lcl_getObjectCIDForCommand( const ::rtl::OString& rDispatchCommand
if( nPointIndex>=0 )
{
OUString aSeriesParticle = ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID );
- OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
- aChildParticle+=(C2U("="));
+ OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" );
OUString aLabelsCID = ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle );
OUString aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent(
OBJECTTYPE_DATA_LABEL, ::rtl::OUString(), aLabelsCID );
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index c57a554..80056ac 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -79,7 +79,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
//#i77362 change notification for changes on additional shapes are missing
uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
if( xChartViewProps.is() )
- xChartViewProps->setPropertyValue( C2U("SdrViewIsInEditMode"), uno::makeAny(sal_True) );
+ xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(sal_True) );
sal_Bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
, m_pDrawViewWrapper->GetPageView()
@@ -119,7 +119,7 @@ bool ChartController::EndTextEdit()
//#i77362 change notification for changes on additional shapes are missing
uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
if( xChartViewProps.is() )
- xChartViewProps->setPropertyValue( C2U("SdrViewIsInEditMode"), uno::makeAny(sal_False) );
+ xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(sal_False) );
SdrObject* pTextObject = m_pDrawViewWrapper->getTextEditObject();
if(!pTextObject)
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 8edd627..17581e3 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -190,9 +190,9 @@ void ChartController::executeDispatch_NewArrangement()
// diagram
Reference< beans::XPropertyState > xState( xDiagram, uno::UNO_QUERY_THROW );
- xState->setPropertyToDefault( C2U("RelativeSize"));
- xState->setPropertyToDefault( C2U("RelativePosition"));
- xState->setPropertyToDefault( C2U("PosSizeExcludeAxes"));
+ xState->setPropertyToDefault( "RelativeSize");
+ xState->setPropertyToDefault( "RelativePosition");
+ xState->setPropertyToDefault( "PosSizeExcludeAxes");
// 3d rotation
ThreeDHelper::set3DSettingsToDefault( uno::Reference< beans::XPropertySet >( xDiagram, uno::UNO_QUERY ) );
@@ -201,9 +201,9 @@ void ChartController::executeDispatch_NewArrangement()
Reference< beans::XPropertyState > xLegendState( xDiagram->getLegend(), uno::UNO_QUERY );
if( xLegendState.is())
{
- xLegendState->setPropertyToDefault( C2U("RelativePosition"));
- xLegendState->setPropertyToDefault( C2U("RelativeSize"));
- xLegendState->setPropertyToDefault( C2U("AnchorPosition"));
+ xLegendState->setPropertyToDefault( "RelativePosition");
+ xLegendState->setPropertyToDefault( "RelativeSize");
+ xLegendState->setPropertyToDefault( "AnchorPosition");
}
// titles
@@ -215,7 +215,7 @@ void ChartController::executeDispatch_NewArrangement()
TitleHelper::getTitle(
static_cast< TitleHelper::eTitleType >( eType ), xModel ), uno::UNO_QUERY );
if( xTitleState.is())
- xTitleState->setPropertyToDefault( C2U("RelativePosition"));
+ xTitleState->setPropertyToDefault( "RelativePosition");
}
// regression curve equations
@@ -341,7 +341,7 @@ void ChartController::impl_PasteGraphic(
return;
uno::Reference< lang::XMultiServiceFactory > xFact( pDrawModelWrapper->getShapeFactory());
uno::Reference< drawing::XShape > xGraphicShape(
- xFact->createInstance( C2U( "com.sun.star.drawing.GraphicObjectShape" )), uno::UNO_QUERY );
+ xFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ), uno::UNO_QUERY );
uno::Reference< beans::XPropertySet > xGraphicShapeProp( xGraphicShape, uno::UNO_QUERY );
if( xGraphicShapeProp.is() && xGraphicShape.is())
{
@@ -359,13 +359,13 @@ void ChartController::impl_PasteGraphic(
m_aSelection.setSelection( xGraphicShape );
m_aSelection.applySelection( m_pDrawViewWrapper );
}
- xGraphicShapeProp->setPropertyValue( C2U("Graphic"), uno::makeAny( xGraphic ));
+ xGraphicShapeProp->setPropertyValue( "Graphic", uno::makeAny( xGraphic ));
uno::Reference< beans::XPropertySet > xGraphicProp( xGraphic, uno::UNO_QUERY );
awt::Size aGraphicSize( 1000, 1000 );
// first try size in 100th mm, then pixel size
- if( ! ( xGraphicProp->getPropertyValue( C2U("Size100thMM")) >>= aGraphicSize ) &&
- ( ( xGraphicProp->getPropertyValue( C2U("SizePixel")) >>= aGraphicSize ) && m_pChartWindow ))
+ if( ! ( xGraphicProp->getPropertyValue( "Size100thMM") >>= aGraphicSize ) &&
+ ( ( xGraphicProp->getPropertyValue( "SizePixel") >>= aGraphicSize ) && m_pChartWindow ))
{
::Size aVCLSize( m_pChartWindow->PixelToLogic( Size( aGraphicSize.Width, aGraphicSize.Height )));
aGraphicSize.Width = aVCLSize.getWidth();
@@ -446,7 +446,7 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
try
{
Reference< drawing::XShape > xTextShape(
- xShapeFactory->createInstance( C2U( "com.sun.star.drawing.TextShape" ) ), uno::UNO_QUERY_THROW );
+ xShapeFactory->createInstance( "com.sun.star.drawing.TextShape" ), uno::UNO_QUERY_THROW );
xDrawPage->add( xTextShape );
Reference< text::XTextRange > xRange( xTextShape, uno::UNO_QUERY_THROW );
@@ -454,14 +454,14 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
float fCharHeight = 10.0;
Reference< beans::XPropertySet > xProperties( xTextShape, uno::UNO_QUERY_THROW );
- xProperties->setPropertyValue( C2U( "TextAutoGrowHeight" ), uno::makeAny( true ) );
- xProperties->setPropertyValue( C2U( "TextAutoGrowWidth" ), uno::makeAny( true ) );
- xProperties->setPropertyValue( C2U( "CharHeight" ), uno::makeAny( fCharHeight ) );
- xProperties->setPropertyValue( C2U( "CharHeightAsian" ), uno::makeAny( fCharHeight ) );
- xProperties->setPropertyValue( C2U( "CharHeightComplex" ), uno::makeAny( fCharHeight ) );
- xProperties->setPropertyValue( C2U( "TextVerticalAdjust" ), uno::makeAny( drawing::TextVerticalAdjust_CENTER ) );
- xProperties->setPropertyValue( C2U( "TextHorizontalAdjust" ), uno::makeAny( drawing::TextHorizontalAdjust_CENTER ) );
- xProperties->setPropertyValue( C2U( "CharFontName" ), uno::makeAny( C2U( "Albany" ) ) );
+ xProperties->setPropertyValue( "TextAutoGrowHeight", uno::makeAny( true ) );
+ xProperties->setPropertyValue( "TextAutoGrowWidth", uno::makeAny( true ) );
+ xProperties->setPropertyValue( "CharHeight", uno::makeAny( fCharHeight ) );
+ xProperties->setPropertyValue( "CharHeightAsian", uno::makeAny( fCharHeight ) );
+ xProperties->setPropertyValue( "CharHeightComplex", uno::makeAny( fCharHeight ) );
+ xProperties->setPropertyValue( "TextVerticalAdjust", uno::makeAny( drawing::TextVerticalAdjust_CENTER ) );
+ xProperties->setPropertyValue( "TextHorizontalAdjust", uno::makeAny( drawing::TextHorizontalAdjust_CENTER ) );
+ xProperties->setPropertyValue( "CharFontName", uno::makeAny( OUString("Albany") ) );
xTextShape->setPosition( rPosition );
@@ -641,7 +641,7 @@ bool ChartController::executeDispatch_Delete()
ActionDescriptionProvider::createDescription(
ActionDescriptionProvider::DELETE, String( SchResId( STR_OBJECT_LEGEND ))),
m_xUndoManager );
- xLegendProp->setPropertyValue( C2U("Show"), uno::makeAny( false ));
+ xLegendProp->setPropertyValue( "Show", uno::makeAny( false ));
bReturn = true;
aUndoGuard.commit();
}
@@ -706,8 +706,8 @@ bool ChartController::executeDispatch_Delete()
m_xUndoManager );
{
ControllerLockGuard aCtlLockGuard( xModel );
- xEqProp->setPropertyValue( C2U("ShowEquation"), uno::makeAny( false ));
- xEqProp->setPropertyValue( C2U("ShowCorrelationCoefficient"), uno::makeAny( false ));
+ xEqProp->setPropertyValue( "ShowEquation", uno::makeAny( false ));
+ xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( false ));
}
bReturn = true;
aUndoGuard.commit();
@@ -741,7 +741,7 @@ bool ChartController::executeDispatch_Delete()
{
ControllerLockGuard aCtlLockGuard( xModel );
xErrorBarProp->setPropertyValue(
- C2U("ErrorBarStyle"),
+ "ErrorBarStyle",
uno::makeAny( ::com::sun::star::chart::ErrorBarStyle::NONE ));
}
bReturn = true;
@@ -763,7 +763,7 @@ bool ChartController::executeDispatch_Delete()
SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))),
m_xUndoManager );
chart2::DataPointLabel aLabel;
- xObjectProperties->getPropertyValue( C2U( "Label" ) ) >>= aLabel;
+ xObjectProperties->getPropertyValue( "Label" ) >>= aLabel;
aLabel.ShowNumber = false;
aLabel.ShowNumberInPercent = false;
aLabel.ShowCategoryName = false;
@@ -771,10 +771,10 @@ bool ChartController::executeDispatch_Delete()
if( aObjectType == OBJECTTYPE_DATA_LABELS )
{
uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( aCID, getModel() ));
- ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Label" ), uno::makeAny(aLabel) );
+ ::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label", uno::makeAny(aLabel) );
}
else
- xObjectProperties->setPropertyValue( C2U( "Label" ), uno::makeAny(aLabel) );
+ xObjectProperties->setPropertyValue( "Label", uno::makeAny(aLabel) );
bReturn = true;
aUndoGuard.commit();
}
@@ -833,9 +833,9 @@ void ChartController::executeDispatch_ToggleLegend()
try
{
bool bShow = false;
- if( xLegendProp->getPropertyValue( C2U("Show")) >>= bShow )
+ if( xLegendProp->getPropertyValue( "Show") >>= bShow )
{
- xLegendProp->setPropertyValue( C2U("Show"), uno::makeAny( ! bShow ));
+ xLegendProp->setPropertyValue( "Show", uno::makeAny( ! bShow ));
bChanged = true;
}
}
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 7f66efb..193f80a 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -143,7 +143,7 @@ void lcl_insertMenuCommand(
OUString lcl_getFormatCommandForObjectCID( const OUString& rCID )
{
- OUString aDispatchCommand( C2U(".uno:FormatSelection") );
+ OUString aDispatchCommand( ".uno:FormatSelection" );
ObjectType eObjectType = ObjectIdentifier::getObjectType( rCID );
@@ -151,71 +151,71 @@ OUString lcl_getFormatCommandForObjectCID( const OUString& rCID )
{
case OBJECTTYPE_DIAGRAM:
case OBJECTTYPE_DIAGRAM_WALL:
- aDispatchCommand = C2U(".uno:FormatWall");
+ aDispatchCommand = ".uno:FormatWall";
break;
case OBJECTTYPE_DIAGRAM_FLOOR:
- aDispatchCommand = C2U(".uno:FormatFloor");
+ aDispatchCommand = ".uno:FormatFloor";
break;
case OBJECTTYPE_PAGE:
- aDispatchCommand = C2U(".uno:FormatChartArea");
+ aDispatchCommand = ".uno:FormatChartArea";
break;
case OBJECTTYPE_LEGEND:
- aDispatchCommand = C2U(".uno:FormatLegend");
+ aDispatchCommand = ".uno:FormatLegend";
break;
case OBJECTTYPE_TITLE:
- aDispatchCommand = C2U(".uno:FormatTitle");
+ aDispatchCommand = ".uno:FormatTitle";
break;
case OBJECTTYPE_LEGEND_ENTRY:
- aDispatchCommand = C2U(".uno:FormatDataSeries");
+ aDispatchCommand = ".uno:FormatDataSeries";
break;
case OBJECTTYPE_AXIS:
case OBJECTTYPE_AXIS_UNITLABEL:
- aDispatchCommand = C2U(".uno:FormatAxis");
+ aDispatchCommand = ".uno:FormatAxis";
break;
case OBJECTTYPE_GRID:
- aDispatchCommand = C2U(".uno:FormatMajorGrid");
+ aDispatchCommand = ".uno:FormatMajorGrid";
break;
case OBJECTTYPE_SUBGRID:
- aDispatchCommand = C2U(".uno:FormatMinorGrid");
+ aDispatchCommand = ".uno:FormatMinorGrid";
break;
case OBJECTTYPE_DATA_LABELS:
- aDispatchCommand = C2U(".uno:FormatDataLabels");
+ aDispatchCommand = ".uno:FormatDataLabels";
break;
case OBJECTTYPE_DATA_SERIES:
- aDispatchCommand = C2U(".uno:FormatDataSeries");
+ aDispatchCommand = ".uno:FormatDataSeries";
break;
case OBJECTTYPE_DATA_LABEL:
- aDispatchCommand = C2U(".uno:FormatDataLabel");
+ aDispatchCommand = ".uno:FormatDataLabel";
break;
case OBJECTTYPE_DATA_POINT:
- aDispatchCommand = C2U(".uno:FormatDataPoint");
+ aDispatchCommand = ".uno:FormatDataPoint";
break;
case OBJECTTYPE_DATA_AVERAGE_LINE:
- aDispatchCommand = C2U(".uno:FormatMeanValue");
+ aDispatchCommand = ".uno:FormatMeanValue";
break;
case OBJECTTYPE_DATA_ERRORS_X:
- aDispatchCommand = C2U(".uno:FormatXErrorBars");
+ aDispatchCommand = ".uno:FormatXErrorBars";
break;
case OBJECTTYPE_DATA_ERRORS_Y:
- aDispatchCommand = C2U(".uno:FormatYErrorBars");
+ aDispatchCommand = ".uno:FormatYErrorBars";
break;
case OBJECTTYPE_DATA_ERRORS_Z:
- aDispatchCommand = C2U(".uno:FormatZErrorBars");
+ aDispatchCommand = ".uno:FormatZErrorBars";
break;
case OBJECTTYPE_DATA_CURVE:
- aDispatchCommand = C2U(".uno:FormatTrendline");
+ aDispatchCommand = ".uno:FormatTrendline";
break;
case OBJECTTYPE_DATA_CURVE_EQUATION:
- aDispatchCommand = C2U(".uno:FormatTrendlineEquation");
+ aDispatchCommand = ".uno:FormatTrendlineEquation";
break;
case OBJECTTYPE_DATA_STOCK_RANGE:
- aDispatchCommand = C2U(".uno:FormatSelection");
+ aDispatchCommand = ".uno:FormatSelection";
break;
case OBJECTTYPE_DATA_STOCK_LOSS:
- aDispatchCommand = C2U(".uno:FormatStockLoss");
+ aDispatchCommand = ".uno:FormatStockLoss";
break;
case OBJECTTYPE_DATA_STOCK_GAIN:
- aDispatchCommand = C2U(".uno:FormatStockGain");
+ aDispatchCommand = ".uno:FormatStockGain";
break;
default: //OBJECTTYPE_UNKNOWN
break;
@@ -263,15 +263,15 @@ const short HITPIX=2; //hit-tolerance in pixel
if( xProp.is() )
{
uno::Sequence< beans::PropertyValue > aZoomFactors(4);
- aZoomFactors[0].Name = C2U("ScaleXNumerator");
+ aZoomFactors[0].Name = "ScaleXNumerator";
aZoomFactors[0].Value = uno::makeAny( nScaleXNumerator );
- aZoomFactors[1].Name = C2U("ScaleXDenominator");
+ aZoomFactors[1].Name = "ScaleXDenominator";
aZoomFactors[1].Value = uno::makeAny( nScaleXDenominator );
- aZoomFactors[2].Name = C2U("ScaleYNumerator");
+ aZoomFactors[2].Name = "ScaleYNumerator";
aZoomFactors[2].Value = uno::makeAny( nScaleYNumerator );
- aZoomFactors[3].Name = C2U("ScaleYDenominator");
+ aZoomFactors[3].Name = "ScaleYDenominator";
aZoomFactors[3].Value = uno::makeAny( nScaleYDenominator );
- xProp->setPropertyValue( C2U("ZoomFactors"), uno::makeAny( aZoomFactors ));
+ xProp->setPropertyValue( "ZoomFactors", uno::makeAny( aZoomFactors ));
}
//a correct work area is at least necessary for correct values in the position and size dialog and for dragging area
@@ -517,7 +517,7 @@ void ChartController::execute_Paint( const Rectangle& rRect )
aResolution.Height = m_pChartWindow->GetSizePixel().Height();
}
}
- xProp->setPropertyValue( C2U("Resolution"), uno::makeAny( aResolution ));
+ xProp->setPropertyValue( "Resolution", uno::makeAny( aResolution ));
}
//
@@ -1034,7 +1034,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
// todo: the context menu should be specified by an xml file in uiconfig
uno::Reference< awt::XPopupMenu > xPopupMenu(
m_xCC->getServiceManager()->createInstanceWithContext(
- C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY );
+ "com.sun.star.awt.PopupMenu", m_xCC ), uno::UNO_QUERY );
uno::Reference< awt::XMenuExtended > xMenuEx( xPopupMenu, uno::UNO_QUERY );
if( xPopupMenu.is() && xMenuEx.is())
{
@@ -1073,7 +1073,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( xSeriesProperties.is() )
{
uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
- if( xSeriesProperties->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList )
+ if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList )
{
if( aAttributedDataPointIndexList.hasElements() )
{
@@ -1095,17 +1095,17 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bIsPoint )
{
if( bHasDataLabelAtPoint )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabel") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatDataLabel" );
if( !bHasDataLabelAtPoint )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabel") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertDataLabel" );
else
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabel") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteDataLabel" );
if( bSelectedPointIsFormatted )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetDataPoint"));
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:ResetDataPoint" );
xPopupMenu->insertSeparator( -1 );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataSeries") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatDataSeries" );
}
Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ) );
@@ -1117,12 +1117,12 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( xChartTypeProp.is() )
{
bool bJapaneseStyle = false;
- xChartTypeProp->getPropertyValue( C2U( "Japanese" ) ) >>= bJapaneseStyle;
+ xChartTypeProp->getPropertyValue( "Japanese" ) >>= bJapaneseStyle;
if( bJapaneseStyle )
{
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockLoss") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockGain") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatStockLoss" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatStockGain" );
}
}
}
@@ -1133,62 +1133,62 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
}
if( bHasDataLabelsAtSeries )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatDataLabels") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatDataLabels" );
if( xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendline") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendline" );
if( bHasEquation )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendlineEquation" );
if( xMeanValue.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMeanValue") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatMeanValue" );
if( bHasXErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatXErrorBars") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatXErrorBars" );
if( bHasYErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatYErrorBars") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatYErrorBars" );
xPopupMenu->insertSeparator( -1 );
if( !bHasDataLabelsAtSeries )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertDataLabels") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertDataLabels" );
if( !xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendline") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendline" );
else if( !bHasEquation )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" );
if( !xMeanValue.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMeanValue") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertMeanValue" );
if( !bHasXErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertXErrorBars"));
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertXErrorBars" );
if( !bHasYErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertYErrorBars") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertYErrorBars" );
if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteDataLabels") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteDataLabels" );
if( xTrendline.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendline") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendline" );
if( bHasEquation )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendlineEquation" );
if( xMeanValue.is() )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMeanValue") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteMeanValue" );
if( bHasXErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteXErrorBars"));
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteXErrorBars" );
if( bHasYErrorBars )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteYErrorBars") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteYErrorBars" );
if( bHasFormattedDataPointsOtherThanSelected )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:ResetAllDataPoints"));
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:ResetAllDataPoints" );
xPopupMenu->insertSeparator( -1 );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow"));
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, ".uno:ArrangeRow" );
uno::Reference< awt::XPopupMenu > xArrangePopupMenu(
m_xCC->getServiceManager()->createInstanceWithContext(
- C2U("com.sun.star.awt.PopupMenu"), m_xCC ), uno::UNO_QUERY );
+ "com.sun.star.awt.PopupMenu", m_xCC ), uno::UNO_QUERY );
uno::Reference< awt::XMenuExtended > xArrangeMenuEx( xArrangePopupMenu, uno::UNO_QUERY );
if( xArrangePopupMenu.is() && xArrangeMenuEx.is())
{
sal_Int16 nSubId = nUniqueId + 1;
- lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId++, C2U(".uno:Forward") );
- lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId, C2U(".uno:Backward") );
+ lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId++, ".uno:Forward" );
+ lcl_insertMenuCommand( xArrangePopupMenu, xArrangeMenuEx, nSubId, ".uno:Backward" );
xPopupMenu->setPopupMenu( nUniqueId, xArrangePopupMenu );
nUniqueId = nSubId;
}
@@ -1196,17 +1196,17 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
}
else if( OBJECTTYPE_DATA_CURVE == eObjectType )
{
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatTrendlineEquation") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquation") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTrendlineEquationAndR2") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertR2Value") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteTrendlineEquation") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteR2Value") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatTrendlineEquation" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquation" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTrendlineEquationAndR2" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertR2Value" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteTrendlineEquation" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteR2Value" );
}
else if( OBJECTTYPE_DATA_CURVE_EQUATION == eObjectType )
{
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertR2Value") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteR2Value") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertR2Value" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteR2Value" );
}
//some commands for axes: and grids
@@ -1230,38 +1230,38 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
bHasTitle = !TitleHelper::getCompleteString( xTitled->getTitleObject() ).isEmpty();
if( OBJECTTYPE_AXIS != eObjectType && bIsAxisVisible )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatAxis") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatAxis" );
if( OBJECTTYPE_GRID != eObjectType && bIsMajorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMajorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatMajorGrid" );
if( OBJECTTYPE_SUBGRID != eObjectType && bIsMinorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatMinorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatMinorGrid" );
xPopupMenu->insertSeparator( -1 );
if( OBJECTTYPE_AXIS != eObjectType && !bIsAxisVisible )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertAxis") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertAxis" );
if( OBJECTTYPE_GRID != eObjectType && !bIsMajorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMajorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertMajorGrid" );
if( OBJECTTYPE_SUBGRID != eObjectType && !bIsMinorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertMinorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertMinorGrid" );
if( !bHasTitle )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertAxisTitle") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertAxisTitle" );
if( bIsAxisVisible )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteAxis") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteAxis" );
if( bIsMajorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMajorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteMajorGrid" );
if( bIsMinorGridVisible && !bIsSecondaryAxis )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteMinorGrid") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteMinorGrid" );
}
}
if( OBJECTTYPE_DATA_STOCK_LOSS == eObjectType )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockGain") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatStockGain" );
else if( OBJECTTYPE_DATA_STOCK_GAIN == eObjectType )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:FormatStockLoss") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:FormatStockLoss" );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:TransformDialog"));
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:TransformDialog" );
if( OBJECTTYPE_PAGE == eObjectType || OBJECTTYPE_DIAGRAM == eObjectType
|| OBJECTTYPE_DIAGRAM_WALL == eObjectType
@@ -1271,24 +1271,24 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( OBJECTTYPE_UNKNOWN != eObjectType )
xPopupMenu->insertSeparator( -1 );
bool bHasLegend = LegendHelper::hasLegend( xDiagram );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertTitles") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertTitles" );
if( !bHasLegend )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertLegend") );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:InsertRemoveAxes") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertLegend" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:InsertRemoveAxes" );
if( bHasLegend )
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DeleteLegend") );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DeleteLegend" );
}
//-----
xPopupMenu->insertSeparator( -1 );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramType"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DataRanges"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:DiagramData"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:View3D"));
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DiagramType" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DataRanges" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:DiagramData" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:View3D" );
xPopupMenu->insertSeparator( -1 );
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Cut"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Copy"));
- lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, C2U(".uno:Paste"));
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:Cut" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:Copy" );
+ lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++, ".uno:Paste" );
::svt::ContextMenuHelper aContextMenuHelper( m_xFrame );
Point aPos( rCEvt.GetMousePosPixel() );
@@ -1553,8 +1553,8 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
uno::Sequence< beans::PropertyValue > aArgs;
xDispatchHelper->executeDispatch(
uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ),
- C2U(".uno:TerminateInplaceActivation"),
- C2U("_parent"),
+ ".uno:TerminateInplaceActivation",
+ "_parent",
frame::FrameSearchFlag::PARENT,
aArgs );
bReturn = true;
@@ -1764,8 +1764,8 @@ bool ChartController::impl_moveOrResizeObject(
chart2::RelativePosition aRelPos;
chart2::RelativeSize aRelSize;
- bool bDeterminePos = !(xObjProp->getPropertyValue( C2U("RelativePosition")) >>= aRelPos);
- bool bDetermineSize = !bNeedResize || !(xObjProp->getPropertyValue( C2U("RelativeSize")) >>= aRelSize);
+ bool bDeterminePos = !(xObjProp->getPropertyValue( "RelativePosition") >>= aRelPos);
+ bool bDetermineSize = !bNeedResize || !(xObjProp->getPropertyValue( "RelativeSize") >>= aRelSize);
if( ( bDeterminePos || bDetermineSize ) &&
( aRefSize.Width > 0 && aRefSize.Height > 0 ) )
@@ -1819,9 +1819,9 @@ bool ChartController::impl_moveOrResizeObject(
{
ControllerLockGuard aCLGuard( xChartModel );
if( bNeedShift )
- xObjProp->setPropertyValue( C2U("RelativePosition"), uno::makeAny( aRelPos ));
+ xObjProp->setPropertyValue( "RelativePosition", uno::makeAny( aRelPos ));
if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also set an explicat size at the diagram when an explicit position is set
- xObjProp->setPropertyValue( C2U("RelativeSize"), uno::makeAny( aRelSize ));
+ xObjProp->setPropertyValue( "RelativeSize", uno::makeAny( aRelSize ));
}
aUndoGuard.commit();
}
@@ -1845,7 +1845,7 @@ bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double f
uno::Reference< beans::XPropertySet > xPointProp( xSeries->getDataPointByIndex( nDataPointIndex ));
double fOffset = 0.0;
if( xPointProp.is() &&
- (xPointProp->getPropertyValue( C2U("Offset" )) >>= fOffset ) &&
+ (xPointProp->getPropertyValue( "Offset" ) >>= fOffset ) &&
(( fAdditionalOffset > 0.0 && fOffset < 1.0 ) || (fOffset > 0.0)) )
{
fOffset += fAdditionalOffset;
@@ -1853,7 +1853,7 @@ bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double f
fOffset = 1.0;
else if( fOffset < 0.0 )
fOffset = 0.0;
- xPointProp->setPropertyValue( C2U("Offset"), uno::makeAny( fOffset ));
+ xPointProp->setPropertyValue( "Offset", uno::makeAny( fOffset ));
bResult = true;
}
}
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index f2cf139..5ca460b 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -167,7 +167,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
xLoadable->load( aCompleteMediaDescriptor );
//resize standalone files to get correct size:
- if( xComponentWindow.is() && aMDHelper.ISSET_FilterName && aMDHelper.FilterName.equals( C2U("StarChart 5.0")) )
+ if( xComponentWindow.is() && aMDHelper.ISSET_FilterName && aMDHelper.FilterName.equals( "StarChart 5.0") )
{
awt::Rectangle aRect( xComponentWindow->getPosSize() );
sal_Int16 nFlags=0;
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 2c17bc5..2c02b02 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -49,9 +49,9 @@ CommandDispatchContainer::CommandDispatchContainer(
{
m_aContainerDocumentCommands =
::comphelper::MakeSet< OUString >
- ( C2U("AddDirect")) ( C2U("NewDoc")) ( C2U("Open"))
- ( C2U("Save")) ( C2U("SaveAs")) ( C2U("SendMail"))
- ( C2U("EditDoc")) ( C2U("ExportDirectToPDF")) ( C2U("PrintDefault"))
+ ("AddDirect") ("NewDoc") ("Open")
+ ("Save") ("SaveAs") ("SendMail")
+ ("EditDoc") ("ExportDirectToPDF") ("PrintDefault")
;
}
@@ -93,8 +93,8 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL(
CommandDispatch * pDispatch = new UndoCommandDispatch( m_xContext, xModel );
xResult.set( pDispatch );
pDispatch->initialize();
- m_aCachedDispatches[ C2U(".uno:Undo") ].set( xResult );
- m_aCachedDispatches[ C2U(".uno:Redo") ].set( xResult );
+ m_aCachedDispatches[ ".uno:Undo" ].set( xResult );
+ m_aCachedDispatches[ ".uno:Redo" ].set( xResult );
m_aToBeDisposedDispatches.push_back( xResult );
}
else if( xModel.is() && ( rURL.Path == "Context" || rURL.Path == "ModifiedStatus" ) )
@@ -103,8 +103,8 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL(
CommandDispatch * pDispatch = new StatusBarCommandDispatch( m_xContext, xModel, xSelSupp );
xResult.set( pDispatch );
pDispatch->initialize();
- m_aCachedDispatches[ C2U(".uno:Context") ].set( xResult );
- m_aCachedDispatches[ C2U(".uno:ModifiedStatus") ].set( xResult );
+ m_aCachedDispatches[ ".uno:Context" ].set( xResult );
+ m_aCachedDispatches[ ".uno:ModifiedStatus" ].set( xResult );
m_aToBeDisposedDispatches.push_back( xResult );
}
else if( xModel.is() &&
@@ -177,7 +177,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getContainerDispatchForU
{
Reference< frame::XDispatchProvider > xDispProv( xFrame->getCreator(), uno::UNO_QUERY );
if( xDispProv.is())
- xResult.set( xDispProv->queryDispatch( rURL, C2U("_self"), 0 ));
+ xResult.set( xDispProv->queryDispatch( rURL, "_self", 0 ));
}
}
return xResult;
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index 995da90..621e918 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -61,7 +61,7 @@ public:
};
CalcConfigItem::CalcConfigItem()
- : ConfigItem( ::rtl::OUString( C2U( "Office.Calc/Layout" )))
+ : ConfigItem( ::rtl::OUString( "Office.Calc/Layout" ))
{
}
@@ -78,9 +78,9 @@ FieldUnit CalcConfigItem::getFieldUnit()
uno::Sequence< ::rtl::OUString > aNames( 1 );
if( lcl_IsMetric() )
- aNames[ 0 ] = ::rtl::OUString( C2U( "Other/MeasureUnit/Metric" ));
+ aNames[ 0 ] = ::rtl::OUString( "Other/MeasureUnit/Metric" );
else
- aNames[ 0 ] = ::rtl::OUString( C2U( "Other/MeasureUnit/NonMetric" ));
+ aNames[ 0 ] = ::rtl::OUString( "Other/MeasureUnit/NonMetric" );
uno::Sequence< uno::Any > aResult( GetProperties( aNames ));
sal_Int32 nValue = 0;
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 14a74c3..bcde205 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -63,9 +63,9 @@ bool lcl_isStatusBarVisible( const Reference< frame::XController > & xController
if( xPropSet.is() )
{
uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
- xPropSet->getPropertyValue( C2U( "LayoutManager" ) ) >>= xLayoutManager;
+ xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager;
if ( xLayoutManager.is() )
- bIsStatusBarVisible = xLayoutManager->isElementVisible( C2U("private:resource/statusbar/statusbar"));
+ bIsStatusBarVisible = xLayoutManager->isElementVisible( "private:resource/statusbar/statusbar" );
}
}
return bIsStatusBarVisible;
@@ -290,7 +290,7 @@ void ControllerState::update(
uno::Reference< beans::XPropertySet > xEqProp(
ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ), uno::UNO_QUERY );
if( xEqProp.is())
- xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient") ) >>= bHasR2Value;
+ xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value;
}
catch(const uno::RuntimeException& e)
{
@@ -540,7 +540,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
{
try
{
- xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog;
+ xProps->getPropertyValue( "DisableDataTableDialog" ) >>= bDisableDataTableDialog;
}
catch( const uno::Exception& e )
{
@@ -550,146 +550,146 @@ void ControllerCommandDispatch::updateCommandAvailability()
}
// edit commands
- m_aCommandAvailability[ C2U(".uno:Cut")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsDeleteableObjectSelected;
- m_aCommandAvailability[ C2U(".uno:Copy")] = bControllerStateIsValid && m_apControllerState->bHasSelectedObject;
- m_aCommandAvailability[ C2U(".uno:Paste")] = bIsWritable && bHasSuitableClipboardContent;
+ m_aCommandAvailability[ ".uno:Cut" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsDeleteableObjectSelected;
+ m_aCommandAvailability[ ".uno:Copy" ] = bControllerStateIsValid && m_apControllerState->bHasSelectedObject;
+ m_aCommandAvailability[ ".uno:Paste" ] = bIsWritable && bHasSuitableClipboardContent;
// toolbar commands
- m_aCommandAvailability[ C2U(".uno:ToggleGridHorizontal")] = bIsWritable;
- m_aCommandArguments[ C2U(".uno:ToggleGridHorizontal")] = uno::makeAny( m_apModelState->bHasMainYGrid );
-
- m_aCommandAvailability[ C2U(".uno:ToggleLegend")] = bIsWritable;
- m_aCommandArguments[ C2U(".uno:ToggleLegend")] = uno::makeAny( m_apModelState->bHasLegend );
-
- m_aCommandAvailability[ C2U(".uno:NewArrangement")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:Update")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:DefaultColors")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:BarWidth")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:NumberOfLines")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:ArrangeRow")] =
+ m_aCommandAvailability[ ".uno:ToggleGridHorizontal" ] = bIsWritable;
+ m_aCommandArguments[ ".uno:ToggleGridHorizontal" ] = uno::makeAny( m_apModelState->bHasMainYGrid );
+
+ m_aCommandAvailability[ ".uno:ToggleLegend" ] = bIsWritable;
+ m_aCommandArguments[ ".uno:ToggleLegend" ] = uno::makeAny( m_apModelState->bHasLegend );
+
+ m_aCommandAvailability[ ".uno:NewArrangement" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:Update" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:DefaultColors" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:BarWidth" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:NumberOfLines" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:ArrangeRow" ] =
bShapeContext || ( bIsWritable && bControllerStateIsValid && ( m_apControllerState->bMayMoveSeriesForward || m_apControllerState->bMayMoveSeriesBackward ) );
// insert objects
- m_aCommandAvailability[ C2U(".uno:InsertTitles")] = m_aCommandAvailability[ C2U(".uno:InsertMenuTitles")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:InsertLegend")] = m_aCommandAvailability[ C2U(".uno:InsertMenuLegend")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:DeleteLegend")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:InsertMenuDataLabels")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:InsertRemoveAxes")] = m_aCommandAvailability[ C2U(".uno:InsertMenuAxes")] = bIsWritable && m_apModelState->bSupportsAxes;
- m_aCommandAvailability[ C2U(".uno:InsertMenuGrids")] = bIsWritable && m_apModelState->bSupportsAxes;
- m_aCommandAvailability[ C2U(".uno:InsertMenuTrendlines")] = bIsWritable && m_apModelState->bSupportsStatistics;
- m_aCommandAvailability[ C2U(".uno:InsertMenuMeanValues")] = bIsWritable && m_apModelState->bSupportsStatistics;
- m_aCommandAvailability[ C2U(".uno:InsertMenuXErrorBars")] = bIsWritable && m_apModelState->bSupportsStatistics;
- m_aCommandAvailability[ C2U(".uno:InsertMenuYErrorBars")] = bIsWritable && m_apModelState->bSupportsStatistics;
- m_aCommandAvailability[ C2U(".uno:InsertSymbol")] = bIsWritable && m_apControllerState->bIsTextObject;
+ m_aCommandAvailability[ ".uno:InsertTitles" ] = m_aCommandAvailability[ ".uno:InsertMenuTitles" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertLegend" ] = m_aCommandAvailability[ ".uno:InsertMenuLegend" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:DeleteLegend" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertMenuDataLabels" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertRemoveAxes" ] = m_aCommandAvailability[ ".uno:InsertMenuAxes" ] = bIsWritable && m_apModelState->bSupportsAxes;
+ m_aCommandAvailability[ ".uno:InsertMenuGrids" ] = bIsWritable && m_apModelState->bSupportsAxes;
+ m_aCommandAvailability[ ".uno:InsertMenuTrendlines" ] = bIsWritable && m_apModelState->bSupportsStatistics;
+ m_aCommandAvailability[ ".uno:InsertMenuMeanValues" ] = bIsWritable && m_apModelState->bSupportsStatistics;
+ m_aCommandAvailability[ ".uno:InsertMenuXErrorBars" ] = bIsWritable && m_apModelState->bSupportsStatistics;
+ m_aCommandAvailability[ ".uno:InsertMenuYErrorBars" ] = bIsWritable && m_apModelState->bSupportsStatistics;
+ m_aCommandAvailability[ ".uno:InsertSymbol" ] = bIsWritable && m_apControllerState->bIsTextObject;
// format objects
bool bFormatObjectAvailable = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsFormateableObjectSelected;
- m_aCommandAvailability[ C2U(".uno:FormatSelection")] = bFormatObjectAvailable;
- m_aCommandAvailability[ C2U(".uno:FormatAxis")] = bFormatObjectAvailable;
- m_aCommandAvailability[ C2U(".uno:FormatTitle")] = bFormatObjectAvailable;
- m_aCommandAvailability[ C2U(".uno:FormatDataSeries")] = bFormatObjectAvailable;
- m_aCommandAvailability[ C2U(".uno:FormatDataPoint")] = bFormatObjectAvailable;
- m_aCommandAvailability[ C2U(".uno:FormatDataLabels")] = bFormatObjectAvailable;
- m_aCommandAvailability[ C2U(".uno:FormatDataLabel")] = bFormatObjectAvailable;
- m_aCommandAvailability[ C2U(".uno:FormatXErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatXErrorBars;
- m_aCommandAvailability[ C2U(".uno:FormatYErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatYErrorBars;
- m_aCommandAvailability[ C2U(".uno:FormatMeanValue")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatMeanValue;
- m_aCommandAvailability[ C2U(".uno:FormatTrendline")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendline;
- m_aCommandAvailability[ C2U(".uno:FormatTrendlineEquation")] = bFormatObjectAvailable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendlineEquation;
- m_aCommandAvailability[ C2U(".uno:FormatStockLoss")] = bFormatObjectAvailable;
- m_aCommandAvailability[ C2U(".uno:FormatStockGain")] = bFormatObjectAvailable;
-
- m_aCommandAvailability[ C2U(".uno:DiagramType")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:Legend")] = bIsWritable && m_apModelState->bHasLegend;
- m_aCommandAvailability[ C2U(".uno:DiagramWall")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasWall;
- m_aCommandAvailability[ C2U(".uno:DiagramArea")] = bIsWritable;
-
- m_aCommandAvailability[ C2U(".uno:TransformDialog")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bHasSelectedObject && m_apControllerState->bIsPositionableObject;
+ m_aCommandAvailability[ ".uno:FormatSelection" ] = bFormatObjectAvailable;
+ m_aCommandAvailability[ ".uno:FormatAxis" ] = bFormatObjectAvailable;
+ m_aCommandAvailability[ ".uno:FormatTitle" ] = bFormatObjectAvailable;
+ m_aCommandAvailability[ ".uno:FormatDataSeries" ] = bFormatObjectAvailable;
+ m_aCommandAvailability[ ".uno:FormatDataPoint" ] = bFormatObjectAvailable;
+ m_aCommandAvailability[ ".uno:FormatDataLabels" ] = bFormatObjectAvailable;
+ m_aCommandAvailability[ ".uno:FormatDataLabel" ] = bFormatObjectAvailable;
+ m_aCommandAvailability[ ".uno:FormatXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatXErrorBars;
+ m_aCommandAvailability[ ".uno:FormatYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatYErrorBars;
+ m_aCommandAvailability[ ".uno:FormatMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatMeanValue;
+ m_aCommandAvailability[ ".uno:FormatTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendline;
+ m_aCommandAvailability[ ".uno:FormatTrendlineEquation" ] = bFormatObjectAvailable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendlineEquation;
+ m_aCommandAvailability[ ".uno:FormatStockLoss" ] = bFormatObjectAvailable;
+ m_aCommandAvailability[ ".uno:FormatStockGain" ] = bFormatObjectAvailable;
+
+ m_aCommandAvailability[ ".uno:DiagramType" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:Legend" ] = bIsWritable && m_apModelState->bHasLegend;
+ m_aCommandAvailability[ ".uno:DiagramWall" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasWall;
+ m_aCommandAvailability[ ".uno:DiagramArea" ] = bIsWritable;
+
+ m_aCommandAvailability[ ".uno:TransformDialog" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bHasSelectedObject && m_apControllerState->bIsPositionableObject;
// 3d commands
- m_aCommandAvailability[ C2U(".uno:View3D")] = bIsWritable && bModelStateIsValid && m_apModelState->bIsThreeD;
- m_aCommandAvailability[ C2U(".uno:DiagramFloor")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasFloor;
+ m_aCommandAvailability[ ".uno:View3D" ] = bIsWritable && bModelStateIsValid && m_apModelState->bIsThreeD;
+ m_aCommandAvailability[ ".uno:DiagramFloor" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasFloor;
//some mor format commands with different ui text
- m_aCommandAvailability[ C2U(".uno:FormatWall")] = m_aCommandAvailability[ C2U(".uno:DiagramWall")];
- m_aCommandAvailability[ C2U(".uno:FormatFloor")] = m_aCommandAvailability[ C2U(".uno:DiagramFloor")];
- m_aCommandAvailability[ C2U(".uno:FormatChartArea")] = m_aCommandAvailability[ C2U(".uno:DiagramArea")];
- m_aCommandAvailability[ C2U(".uno:FormatLegend")] = m_aCommandAvailability[ C2U(".uno:Legend")];
+ m_aCommandAvailability[ ".uno:FormatWall" ] = m_aCommandAvailability[ ".uno:DiagramWall" ];
+ m_aCommandAvailability[ ".uno:FormatFloor" ] = m_aCommandAvailability[ ".uno:DiagramFloor" ];
+ m_aCommandAvailability[ ".uno:FormatChartArea" ] = m_aCommandAvailability[ ".uno:DiagramArea" ];
+ m_aCommandAvailability[ ".uno:FormatLegend" ] = m_aCommandAvailability[ ".uno:Legend" ];
// depending on own data
- m_aCommandAvailability[ C2U(".uno:DataRanges")] = bIsWritable && bModelStateIsValid && (! m_apModelState->bHasOwnData);
- m_aCommandAvailability[ C2U(".uno:DiagramData")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasOwnData && !bDisableDataTableDialog;
+ m_aCommandAvailability[ ".uno:DataRanges" ] = bIsWritable && bModelStateIsValid && (! m_apModelState->bHasOwnData);
+ m_aCommandAvailability[ ".uno:DiagramData" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasOwnData && !bDisableDataTableDialog;
// titles
- m_aCommandAvailability[ C2U(".uno:MainTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainTitle;
- m_aCommandAvailability[ C2U(".uno:SubTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSubTitle;
- m_aCommandAvailability[ C2U(".uno:XTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxisTitle;
- m_aCommandAvailability[ C2U(".uno:YTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxisTitle;
- m_aCommandAvailability[ C2U(".uno:ZTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxisTitle;
- m_aCommandAvailability[ C2U(".uno:SecondaryXTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryXAxisTitle;
- m_aCommandAvailability[ C2U(".uno:SecondaryYTitle")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryYAxisTitle;
- m_aCommandAvailability[ C2U(".uno:AllTitles")] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyTitle();
+ m_aCommandAvailability[ ".uno:MainTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainTitle;
+ m_aCommandAvailability[ ".uno:SubTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSubTitle;
+ m_aCommandAvailability[ ".uno:XTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxisTitle;
+ m_aCommandAvailability[ ".uno:YTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxisTitle;
+ m_aCommandAvailability[ ".uno:ZTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxisTitle;
+ m_aCommandAvailability[ ".uno:SecondaryXTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryXAxisTitle;
+ m_aCommandAvailability[ ".uno:SecondaryYTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryYAxisTitle;
+ m_aCommandAvailability[ ".uno:AllTitles" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyTitle();
// text
- m_aCommandAvailability[ C2U(".uno:ScaleText")] = bIsWritable && bModelStateIsValid ;
- m_aCommandArguments[ C2U(".uno:ScaleText")] = uno::makeAny( m_apModelState->bHasAutoScaledText );
+ m_aCommandAvailability[ ".uno:ScaleText" ] = bIsWritable && bModelStateIsValid ;
+ m_aCommandArguments[ ".uno:ScaleText" ] = uno::makeAny( m_apModelState->bHasAutoScaledText );
// axes
- m_aCommandAvailability[ C2U(".uno:DiagramAxisX")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxis;
- m_aCommandAvailability[ C2U(".uno:DiagramAxisY")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxis;
- m_aCommandAvailability[ C2U(".uno:DiagramAxisZ")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxis;
- m_aCommandAvailability[ C2U(".uno:DiagramAxisA")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasAAxis;
- m_aCommandAvailability[ C2U(".uno:DiagramAxisB")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasBAxis;
- m_aCommandAvailability[ C2U(".uno:DiagramAxisAll")] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyAxis();
+ m_aCommandAvailability[ ".uno:DiagramAxisX" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxis;
+ m_aCommandAvailability[ ".uno:DiagramAxisY" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxis;
+ m_aCommandAvailability[ ".uno:DiagramAxisZ" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxis;
+ m_aCommandAvailability[ ".uno:DiagramAxisA" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasAAxis;
+ m_aCommandAvailability[ ".uno:DiagramAxisB" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasBAxis;
+ m_aCommandAvailability[ ".uno:DiagramAxisAll" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyAxis();
// grids
// note: x and y are swapped in the commands!
- m_aCommandAvailability[ C2U(".uno:DiagramGridYMain")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainXGrid;
- m_aCommandAvailability[ C2U(".uno:DiagramGridXMain")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainYGrid;
- m_aCommandAvailability[ C2U(".uno:DiagramGridZMain")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainZGrid;
- m_aCommandAvailability[ C2U(".uno:DiagramGridYHelp")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpXGrid;
- m_aCommandAvailability[ C2U(".uno:DiagramGridXHelp")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpYGrid;
- m_aCommandAvailability[ C2U(".uno:DiagramGridZHelp")] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpZGrid;
- m_aCommandAvailability[ C2U(".uno:DiagramGridAll")] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyGrid();
+ m_aCommandAvailability[ ".uno:DiagramGridYMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainXGrid;
+ m_aCommandAvailability[ ".uno:DiagramGridXMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainYGrid;
+ m_aCommandAvailability[ ".uno:DiagramGridZMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainZGrid;
+ m_aCommandAvailability[ ".uno:DiagramGridYHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpXGrid;
+ m_aCommandAvailability[ ".uno:DiagramGridXHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpYGrid;
+ m_aCommandAvailability[ ".uno:DiagramGridZHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpZGrid;
+ m_aCommandAvailability[ ".uno:DiagramGridAll" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyGrid();
// series arrangement
- m_aCommandAvailability[ C2U(".uno:Forward")] = ( bShapeContext ? isShapeControllerCommandAvailable( C2U( ".uno:Forward" ) ) :
+ m_aCommandAvailability[ ".uno:Forward" ] = ( bShapeContext ? isShapeControllerCommandAvailable( ".uno:Forward" ) :
( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesForward && !bDisableDataTableDialog ) );
- m_aCommandAvailability[ C2U(".uno:Backward")] = ( bShapeContext ? isShapeControllerCommandAvailable( C2U( ".uno:Backward" ) ) :
+ m_aCommandAvailability[ ".uno:Backward" ] = ( bShapeContext ? isShapeControllerCommandAvailable( ".uno:Backward" ) :
( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesBackward && !bDisableDataTableDialog ) );
- m_aCommandAvailability[ C2U(".uno:InsertDataLabels")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:InsertDataLabel")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:InsertMeanValue")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddMeanValue;
- m_aCommandAvailability[ C2U(".uno:InsertTrendline")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendline;
- m_aCommandAvailability[ C2U(".uno:InsertTrendlineEquation")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
- m_aCommandAvailability[ C2U(".uno:InsertTrendlineEquationAndR2")] = m_aCommandAvailability[ C2U(".uno:InsertTrendlineEquation")];
- m_aCommandAvailability[ C2U(".uno:InsertR2Value")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddR2Value;
- m_aCommandAvailability[ C2U(".uno:DeleteR2Value")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value;
-
- m_aCommandAvailability[ C2U(".uno:InsertXErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars;
- m_aCommandAvailability[ C2U(".uno:InsertYErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddYErrorBars;
-
- m_aCommandAvailability[ C2U(".uno:DeleteDataLabels")] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:DeleteDataLabel") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:DeleteTrendline") ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendline;
- m_aCommandAvailability[ C2U(".uno:DeleteTrendlineEquation") ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendlineEquation;
- m_aCommandAvailability[ C2U(".uno:DeleteMeanValue") ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteMeanValue;
- m_aCommandAvailability[ C2U(".uno:DeleteXErrorBars")] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteXErrorBars;
- m_aCommandAvailability[ C2U(".uno:DeleteYErrorBars") ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteYErrorBars;
-
- m_aCommandAvailability[ C2U(".uno:ResetDataPoint") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:ResetAllDataPoints") ] = bIsWritable;
-
- m_aCommandAvailability[ C2U(".uno:InsertAxis") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:DeleteAxis") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:InsertAxisTitle") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:FormatMajorGrid") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:InsertMajorGrid") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:DeleteMajorGrid") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:FormatMinorGrid") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:InsertMinorGrid") ] = bIsWritable;
- m_aCommandAvailability[ C2U(".uno:DeleteMinorGrid") ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertDataLabels" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertDataLabel" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddMeanValue;
+ m_aCommandAvailability[ ".uno:InsertTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendline;
+ m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
+ m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] = m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ];
+ m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddR2Value;
+ m_aCommandAvailability[ ".uno:DeleteR2Value" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value;
+
+ m_aCommandAvailability[ ".uno:InsertXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars;
+ m_aCommandAvailability[ ".uno:InsertYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddYErrorBars;
+
+ m_aCommandAvailability[ ".uno:DeleteDataLabels" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:DeleteDataLabel" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:DeleteTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendline;
+ m_aCommandAvailability[ ".uno:DeleteTrendlineEquation" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendlineEquation;
+ m_aCommandAvailability[ ".uno:DeleteMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteMeanValue;
+ m_aCommandAvailability[ ".uno:DeleteXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteXErrorBars;
+ m_aCommandAvailability[ ".uno:DeleteYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteYErrorBars;
+
+ m_aCommandAvailability[ ".uno:ResetDataPoint" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:ResetAllDataPoints" ] = bIsWritable;
+
+ m_aCommandAvailability[ ".uno:InsertAxis" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:DeleteAxis" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertAxisTitle" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:FormatMajorGrid" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertMajorGrid" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:DeleteMajorGrid" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:FormatMinorGrid" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:InsertMinorGrid" ] = bIsWritable;
+ m_aCommandAvailability[ ".uno:DeleteMinorGrid" ] = bIsWritable;
}
bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand )
@@ -721,7 +721,7 @@ void ControllerCommandDispatch::fireStatusEvent(
{
uno::Any aArg;
aArg <<= m_xController;
- fireStatusEventForURL( C2U(".uno:ChartElementSelector"), aArg, true, xSingleListener );
+ fireStatusEventForURL( ".uno:ChartElementSelector", aArg, true, xSingleListener );
}
if( rURL.isEmpty() )
@@ -736,7 +736,7 @@ void ControllerCommandDispatch::fireStatusEvent(
if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" )
{
bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xController ));
- fireStatusEventForURL( C2U(".uno:StatusBarVisible"), uno::makeAny( bIsStatusBarVisible ), true, xSingleListener );
+ fireStatusEventForURL( ".uno:StatusBarVisible", uno::makeAny( bIsStatusBarVisible ), true, xSingleListener );
}
}
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 99ce279..27267ea 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -119,7 +119,7 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/)
Reference< beans::XPropertySet > xPointProperties(
ObjectIdentifier::getObjectPropertySet( m_aObjectCID, xChartModel ) );
if( xPointProperties.is() )
- xPointProperties->setPropertyValue( C2U( "Offset" ), uno::makeAny( m_fAdditionalOffset+m_fInitialOffset ));
+ xPointProperties->setPropertyValue( "Offset", uno::makeAny( m_fAdditionalOffset+m_fInitialOffset ));
}
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 8489ab3..ce8a0e1 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -88,7 +88,7 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr
if( ChartTypeHelper::isSupportingRightAngledAxes(
DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ) )
- xDiagramProperties->getPropertyValue(C2U( "RightAngledAxes" )) >>= m_bRightAngledAxes;
+ xDiagramProperties->getPropertyValue("RightAngledAxes") >>= m_bRightAngledAxes;
if(m_bRightAngledAxes)
{
if( m_eRotationDirection==ROTATIONDIRECTION_Z )
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 116ac6f..1820e80 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -382,7 +382,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
pDrawViewWrapper->SetCreateMode();
}
- const ::rtl::OUString sKeyModifier( C2U( "KeyModifier" ) );
+ const ::rtl::OUString sKeyModifier( "KeyModifier" );
const beans::PropertyValue* pIter = rArgs.getConstArray();
const beans::PropertyValue* pEnd = pIter + rArgs.getLength();
const beans::PropertyValue* pKeyModifier = ::std::find_if(
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 5505324..55132d7 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -256,7 +256,7 @@ APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName
Sequence< ::rtl::OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
{
Sequence< ::rtl::OUString > aServices(1);
- aServices[ 0 ] = C2U( "com.sun.star.frame.ToolbarController" );
+ aServices[ 0 ] = "com.sun.star.frame.ToolbarController";
return aServices;
}
// -----------------------------------------------------------------------------
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 3a38de7..6ed11f9 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -85,8 +85,8 @@ void lcl_getChildOIDs(
Reference< beans::XPropertySetInfo > xInfo( xShapeProp->getPropertySetInfo());
OUString aName;
if( xInfo.is() &&
- xInfo->hasPropertyByName( C2U("Name")) &&
- (xShapeProp->getPropertyValue( C2U("Name")) >>= aName ) &&
+ xInfo->hasPropertyByName( "Name") &&
+ (xShapeProp->getPropertyValue( "Name") >>= aName ) &&
!aName.isEmpty() &&
::chart::ObjectIdentifier::isCID( aName ))
{
@@ -444,7 +444,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) )
{
rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
- aChildParticle+=(C2U("="));
+ aChildParticle+=("=");
aSeriesSubContainer.push_back(
ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) );
}
@@ -470,11 +470,11 @@ void ImplObjectHierarchy::createDataSeriesTree(
Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY );
Reference< beans::XPropertySet > xErrorBarProp;
if( xSeriesProp.is() &&
- (xSeriesProp->getPropertyValue( C2U("ErrorBarY")) >>= xErrorBarProp) &&
+ (xSeriesProp->getPropertyValue( "ErrorBarY") >>= xErrorBarProp) &&
xErrorBarProp.is())
{
sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
- if( ( xErrorBarProp->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle ) &&
+ if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) &&
( nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ) )
{
aSeriesSubContainer.push_back(
@@ -484,11 +484,11 @@ void ImplObjectHierarchy::createDataSeriesTree(
}
if( xSeriesProp.is() &&
- (xSeriesProp->getPropertyValue( C2U("ErrorBarX")) >>= xErrorBarProp) &&
+ (xSeriesProp->getPropertyValue( "ErrorBarX") >>= xErrorBarProp) &&
xErrorBarProp.is())
{
sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
- if( ( xErrorBarProp->getPropertyValue( C2U("ErrorBarStyle")) >>= nStyle ) &&
+ if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) &&
( nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE ) )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list