summaryrefslogtreecommitdiff
path: root/sc/source/ui/vba
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/vba')
-rw-r--r--sc/source/ui/vba/excelvbahelper.cxx2
-rw-r--r--sc/source/ui/vba/testvba/testvba.cxx2
-rw-r--r--sc/source/ui/vba/vbaapplication.cxx2
-rw-r--r--sc/source/ui/vba/vbaaxis.cxx8
-rw-r--r--sc/source/ui/vba/vbaborders.cxx2
-rw-r--r--sc/source/ui/vba/vbachart.cxx32
-rw-r--r--sc/source/ui/vba/vbachartobject.cxx2
-rw-r--r--sc/source/ui/vba/vbaformatconditions.cxx10
-rw-r--r--sc/source/ui/vba/vbainterior.cxx6
-rw-r--r--sc/source/ui/vba/vbastyle.cxx2
-rw-r--r--sc/source/ui/vba/vbastyles.cxx4
-rw-r--r--sc/source/ui/vba/vbawindow.cxx4
-rw-r--r--sc/source/ui/vba/vbaworkbooks.cxx2
13 files changed, 39 insertions, 39 deletions
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index b4bf3ff4670b..f61239c37bf3 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -101,7 +101,7 @@ void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom
pViewSh->RefreshZoom();
}
-const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
+const ::rtl::OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning");
class PasteCellsWarningReseter
{
diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx
index f3d32063b472..8e8729a31ae9 100644
--- a/sc/source/ui/vba/testvba/testvba.cxx
+++ b/sc/source/ui/vba/testvba/testvba.cxx
@@ -64,7 +64,7 @@ using ::rtl::OUString;
using ::std::auto_ptr;
-const OUString EXTN(RTL_CONSTASCII_USTRINGPARAM(".xls"));
+const OUString EXTN(".xls");
OUString convertToURL( const OUString& rPath )
{
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 9afb8724653e..0d39fa37eead 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -707,7 +707,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
rtl::OUString SAL_CALL
ScVbaApplication::getName() throw (uno::RuntimeException)
{
- static rtl::OUString appName( RTL_CONSTASCII_USTRINGPARAM("Microsoft Excel" ) );
+ static rtl::OUString appName("Microsoft Excel" );
return appName;
}
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 035383a118c4..52f152ffd008 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -29,10 +29,10 @@ using namespace ::ooo::vba::excel::XlAxisCrosses;
using namespace ::ooo::vba::excel::XlAxisType;
using namespace ::ooo::vba::excel::XlScaleType;
-const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
-const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("Max") );
-const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("Min") );
+const rtl::OUString ORIGIN("Origin");
+const rtl::OUString AUTOORIGIN("AutoOrigin");
+const rtl::OUString VBA_MIN("Max");
+const rtl::OUString VBA_MAX("Min");
ScVbaChart*
ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
{
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index e792c6ea5418..a184897d9ef0 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -42,7 +42,7 @@ typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base;
// borders, the enumeration will match the order in this list
static const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal };
-const static rtl::OUString sTableBorder( RTL_CONSTASCII_USTRINGPARAM("TableBorder") );
+const static rtl::OUString sTableBorder("TableBorder");
// Equiv widths in in 1/100 mm
const static sal_Int32 OOLineThin = 35;
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index a050d4f93553..760095a49bae 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -47,23 +47,23 @@ using namespace ::ooo::vba::excel::XlRowCol;
using namespace ::ooo::vba::excel::XlAxisType;
using namespace ::ooo::vba::excel::XlAxisGroup;
-const rtl::OUString CHART_NAME( RTL_CONSTASCII_USTRINGPARAM("Name") );
+const rtl::OUString CHART_NAME("Name");
// #TODO move this constant to vbaseries.[ch]xx ( when it exists )
-const rtl::OUString DEFAULTSERIESPREFIX( RTL_CONSTASCII_USTRINGPARAM("Series") );
-const rtl::OUString DATAROWSOURCE( RTL_CONSTASCII_USTRINGPARAM("DataRowSource") );
-const rtl::OUString UPDOWN( RTL_CONSTASCII_USTRINGPARAM("UpDown") );
-const rtl::OUString VOLUME( RTL_CONSTASCII_USTRINGPARAM("Volume") );
-const rtl::OUString LINES( RTL_CONSTASCII_USTRINGPARAM("Lines") );
-const rtl::OUString SPLINETYPE( RTL_CONSTASCII_USTRINGPARAM("SplineType") );
-const rtl::OUString SYMBOLTYPE( RTL_CONSTASCII_USTRINGPARAM("SymbolType") );
-const rtl::OUString DEEP( RTL_CONSTASCII_USTRINGPARAM("Deep") );
-const rtl::OUString SOLIDTYPE( RTL_CONSTASCII_USTRINGPARAM("SolidType") );
-const rtl::OUString VERTICAL( RTL_CONSTASCII_USTRINGPARAM("Vertical") );
-const rtl::OUString PERCENT( RTL_CONSTASCII_USTRINGPARAM("Percent") );
-const rtl::OUString STACKED( RTL_CONSTASCII_USTRINGPARAM("Stacked") );
-const rtl::OUString DIM3D( RTL_CONSTASCII_USTRINGPARAM("Dim3D") );
-const rtl::OUString HASMAINTITLE( RTL_CONSTASCII_USTRINGPARAM("HasMainTitle") );
-const rtl::OUString HASLEGEND( RTL_CONSTASCII_USTRINGPARAM("HasLegend") );
+const rtl::OUString DEFAULTSERIESPREFIX("Series");
+const rtl::OUString DATAROWSOURCE("DataRowSource");
+const rtl::OUString UPDOWN("UpDown");
+const rtl::OUString VOLUME("Volume");
+const rtl::OUString LINES("Lines");
+const rtl::OUString SPLINETYPE("SplineType");
+const rtl::OUString SYMBOLTYPE("SymbolType");
+const rtl::OUString DEEP("Deep");
+const rtl::OUString SOLIDTYPE("SolidType");
+const rtl::OUString VERTICAL("Vertical");
+const rtl::OUString PERCENT("Percent");
+const rtl::OUString STACKED("Stacked");
+const rtl::OUString DIM3D("Dim3D");
+const rtl::OUString HASMAINTITLE("HasMainTitle");
+const rtl::OUString HASLEGEND("HasLegend");
ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ) : ChartImpl_BASE( _xParent, _xContext ), mxTableChart( _xTableChart )
{
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 07183cc036da..42cf8f1758f2 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -28,7 +28,7 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-const rtl::OUString PERSIST_NAME( RTL_CONSTASCII_USTRINGPARAM("PersistName") );
+const rtl::OUString PERSIST_NAME("PersistName");
ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier )
{
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index f0922d52f384..8e1989f6b2de 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -31,11 +31,11 @@ using namespace ::com::sun::star;
typedef std::vector< beans::PropertyValue > VecPropValues;
-static rtl::OUString OPERATOR( RTL_CONSTASCII_USTRINGPARAM("Operator") );
-static rtl::OUString FORMULA1( RTL_CONSTASCII_USTRINGPARAM("Formula1") );
-static rtl::OUString FORMULA2( RTL_CONSTASCII_USTRINGPARAM("Formula2") );
-static rtl::OUString STYLENAME( RTL_CONSTASCII_USTRINGPARAM("StyleName") );
-static rtl::OUString sStyleNamePrefix( RTL_CONSTASCII_USTRINGPARAM("Excel_CondFormat") );
+static rtl::OUString OPERATOR("Operator");
+static rtl::OUString FORMULA1("Formula1");
+static rtl::OUString FORMULA2("Formula2");
+static rtl::OUString STYLENAME("StyleName");
+static rtl::OUString sStyleNamePrefix("Excel_CondFormat");
void SAL_CALL
ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 7b4d65d8496b..69b80b13d840 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -48,9 +48,9 @@ typedef std::pair< sal_Int32, sal_Int32 > PatternPair;
using namespace ::com::sun::star;
using namespace ::ooo::vba;
using namespace ::ooo::vba::excel::XlPattern;
-static const rtl::OUString BACKCOLOR( RTL_CONSTASCII_USTRINGPARAM( "CellBackColor" ) );
-static const rtl::OUString PATTERN( RTL_CONSTASCII_USTRINGPARAM( "Pattern" ) );
-static const rtl::OUString PATTERNCOLOR( RTL_CONSTASCII_USTRINGPARAM( "PatternColor" ) );
+static const rtl::OUString BACKCOLOR( "CellBackColor" );
+static const rtl::OUString PATTERN( "Pattern" );
+static const rtl::OUString PATTERNCOLOR( "PatternColor" );
static PatternMap lcl_getPatternMap()
{
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index 086dc8e322e4..427a70410722 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -23,7 +23,7 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-static rtl::OUString DISPLAYNAME( RTL_CONSTASCII_USTRINGPARAM("DisplayName") );
+static rtl::OUString DISPLAYNAME("DisplayName");
diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx
index fa49f5f47819..2706440c972c 100644
--- a/sc/source/ui/vba/vbastyles.cxx
+++ b/sc/source/ui/vba/vbastyles.cxx
@@ -23,7 +23,7 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-static rtl::OUString SDEFAULTCELLSTYLENAME( RTL_CONSTASCII_USTRINGPARAM("Default") );
+static rtl::OUString SDEFAULTCELLSTYLENAME("Default");
static css::uno::Any
lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel )
{
@@ -99,7 +99,7 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr
uno::Reference< excel::XStyle > aRet;
try
{
- rtl::OUString sParentCellStyleName( RTL_CONSTASCII_USTRINGPARAM("Default"));
+ rtl::OUString sParentCellStyleName("Default");
if ( _aBasedOn.hasValue() )
{
uno::Reference< excel::XRange > oRange;
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index f56f3039987a..2ac13621ae32 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -305,7 +305,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P
uno::Any SAL_CALL
ScVbaWindow::getCaption() throw (uno::RuntimeException)
{
- static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) );
+ static rtl::OUString sCrud(" - OpenOffice.org Calc" );
static sal_Int32 nCrudLen = sCrud.getLength();
rtl::OUString sTitle;
@@ -330,7 +330,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException)
if ( !sTitle.equals( sName ) )
{
- static rtl::OUString sDot( RTL_CONSTASCII_USTRINGPARAM(".") );
+ static rtl::OUString sDot(".");
// starts with title
if ( sName.indexOf( sTitle ) == 0 )
// extention starts immediately after
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 70d3ab4968c4..a9357fae6194 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -306,7 +306,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi
sProps.realloc( 3 );
sProps[ nIndex ].Name = rtl::OUString("FilterOptions" );
sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ };
- static rtl::OUString sRestOfFormat( RTL_CONSTASCII_USTRINGPARAM(",34,0,1" ) );
+ static rtl::OUString sRestOfFormat(",34,0,1" );
rtl::OUString sFormat;
sal_Int16 nFormat = 0; // default indicator