[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source basic/source chart2/source comphelper/source connectivity/source cui/source dbaccess/source desktop/source drawinglayer/source extensions/source filter/source forms/source fpicker/source framework/source idlc/source jvmfwk/plugins linguistic/source mysqlc/source oox/source reportdesign/source sax/source scaddins/source scripting/source sc/source sdext/source sd/source sfx2/source svgio/inc svgio/source svl/source svtools/source svx/source sw/qa sw/source toolkit/source unotools/source unoxml/source vbahelper/source vcl/source vcl/unx writerfilter/source xmlhelp/source xmloff/source xmlscript/source
Noel Grandin
noel at peralex.com
Tue Nov 4 22:45:12 PST 2014
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 3
accessibility/source/extended/accessiblelistboxentry.cxx | 8
accessibility/source/standard/vclxaccessibleedit.cxx | 3
avmedia/source/viewer/mediawindow.cxx | 4
basctl/source/basicide/baside3.cxx | 4
basctl/source/basicide/basides1.cxx | 12
basctl/source/basicide/localizationmgr.cxx | 6
basctl/source/dlged/dlged.cxx | 6
basctl/source/dlged/propbrw.cxx | 2
basic/source/classes/errobject.cxx | 3
basic/source/classes/sbunoobj.cxx | 2
basic/source/classes/sbxmod.cxx | 28 -
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx | 4
chart2/source/controller/main/ElementSelector.cxx | 4
chart2/source/model/main/Axis.cxx | 4
chart2/source/model/main/CartesianCoordinateSystem.cxx | 12
chart2/source/model/main/GridProperties.cxx | 4
chart2/source/model/main/Legend.cxx | 4
chart2/source/model/main/PageBackground.cxx | 4
chart2/source/model/main/PolarCoordinateSystem.cxx | 12
chart2/source/model/main/Title.cxx | 4
chart2/source/tools/CachedDataSequence.cxx | 4
chart2/source/tools/ConfigColorScheme.cxx | 2
chart2/source/tools/DataSource.cxx | 4
chart2/source/tools/ErrorBar.cxx | 4
chart2/source/tools/InternalDataProvider.cxx | 42 -
chart2/source/tools/ObjectIdentifier.cxx | 25
chart2/source/tools/ReferenceSizeProvider.cxx | 4
chart2/source/tools/RegressionCurveCalculator.cxx | 6
chart2/source/tools/RegressionEquation.cxx | 6
chart2/source/tools/Scaling.cxx | 61 +-
chart2/source/tools/UncachedDataSequence.cxx | 4
chart2/source/view/axes/DateScaling.cxx | 20
comphelper/source/misc/logging.cxx | 26
comphelper/source/misc/numbers.cxx | 3
connectivity/source/commontools/AutoRetrievingBase.cxx | 6
connectivity/source/commontools/DateConversion.cxx | 5
connectivity/source/commontools/DriversConfig.cxx | 4
connectivity/source/commontools/TTableHelper.cxx | 12
connectivity/source/commontools/conncleanup.cxx | 15
connectivity/source/commontools/dbtools2.cxx | 30 -
connectivity/source/commontools/predicateinput.cxx | 8
connectivity/source/cpool/ZConnectionPool.cxx | 18
connectivity/source/cpool/ZPoolCollection.cxx | 25
connectivity/source/drivers/ado/AConnection.cxx | 2
connectivity/source/drivers/calc/CTable.cxx | 6
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 3
connectivity/source/drivers/dbase/DTable.cxx | 4
connectivity/source/drivers/evoab2/NResultSetMetaData.cxx | 2
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 10
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 6
connectivity/source/drivers/flat/ETable.cxx | 28 -
connectivity/source/drivers/hsqldb/HCatalog.cxx | 4
connectivity/source/drivers/hsqldb/HTables.cxx | 6
connectivity/source/drivers/hsqldb/HUser.cxx | 20
connectivity/source/drivers/jdbc/JConnection.cxx | 2
connectivity/source/drivers/kab/KDatabaseMetaData.cxx | 4
connectivity/source/drivers/kab/KResultSetMetaData.cxx | 2
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx | 4
connectivity/source/drivers/macab/MacabResultSetMetaData.cxx | 2
connectivity/source/drivers/mysql/YCatalog.cxx | 6
connectivity/source/drivers/mysql/YDriver.cxx | 2
connectivity/source/drivers/mysql/YTable.cxx | 7
connectivity/source/drivers/mysql/YTables.cxx | 16
connectivity/source/drivers/mysql/YUser.cxx | 20
connectivity/source/drivers/postgresql/pq_driver.cxx | 9
connectivity/source/parse/sqliterator.cxx | 6
cui/source/customize/acccfg.cxx | 14
cui/source/customize/cfgutil.cxx | 20
cui/source/customize/macropg.cxx | 13
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/options/connpoolconfig.cxx | 30 -
cui/source/options/optgdlg.cxx | 17
dbaccess/source/core/api/CacheSet.cxx | 8
dbaccess/source/core/api/FilteredContainer.cxx | 2
dbaccess/source/core/api/KeySet.cxx | 18
dbaccess/source/core/api/OptimisticSet.cxx | 10
dbaccess/source/core/api/View.cxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 15
dbaccess/source/core/dataaccess/documentcontainer.cxx | 2
dbaccess/source/core/dataaccess/documentdefinition.cxx | 2
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 2
dbaccess/source/core/misc/dsntypes.cxx | 6
dbaccess/source/core/recovery/dbdocrecovery.cxx | 38 -
dbaccess/source/core/recovery/storagetextstream.cxx | 22
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 58 --
dbaccess/source/ext/macromigration/migrationengine.cxx | 34 -
dbaccess/source/filter/xml/xmlExport.cxx | 22
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/app/AppControllerGen.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/browser/genericcontroller.cxx | 8
dbaccess/source/ui/control/FieldDescControl.cxx | 2
dbaccess/source/ui/dlg/CollectionView.cxx | 14
dbaccess/source/ui/dlg/queryfilter.cxx | 6
dbaccess/source/ui/dlg/queryorder.cxx | 4
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/misc/UITools.cxx | 4
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 3
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 11
dbaccess/source/ui/querydesign/querycontroller.cxx | 6
desktop/source/app/app.cxx | 6
desktop/source/migration/services/oo3extensionmigration.cxx | 8
desktop/source/migration/services/wordbookmigration.cxx | 4
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 7
drawinglayer/source/geometry/viewinformation2d.cxx | 30 -
drawinglayer/source/geometry/viewinformation3d.cxx | 45 -
extensions/source/abpilot/fieldmappingimpl.cxx | 19
extensions/source/dbpilots/controlwizard.cxx | 2
extensions/source/dbpilots/gridwizard.cxx | 10
extensions/source/dbpilots/optiongrouplayouter.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 6
filter/source/msfilter/escherex.cxx | 30 -
filter/source/msfilter/mstoolbar.cxx | 4
filter/source/msfilter/svdfppt.cxx | 38 -
filter/source/svg/svgreader.cxx | 13
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/FormattedField.cxx | 4
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 4
framework/source/classes/menumanager.cxx | 2
framework/source/fwi/jobs/jobconst.cxx | 9
framework/source/jobs/jobdata.cxx | 2
framework/source/jobs/shelljob.cxx | 10
framework/source/loadenv/loadenv.cxx | 6
idlc/source/idlccompile.cxx | 8
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 4
linguistic/source/dicimp.cxx | 2
mysqlc/source/mysqlc_databasemetadata.cxx | 3
oox/source/core/relations.cxx | 6
oox/source/core/xmlfilterbase.cxx | 6
oox/source/ole/axcontrol.cxx | 4
oox/source/ole/vbamodule.cxx | 2
reportdesign/source/core/api/ReportDefinition.cxx | 2
reportdesign/source/core/api/ReportEngineJFree.cxx | 6
reportdesign/source/core/misc/reportformula.cxx | 31 -
reportdesign/source/filter/xml/xmlCell.cxx | 11
reportdesign/source/filter/xml/xmlExport.cxx | 16
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 12
reportdesign/source/filter/xml/xmlFixedContent.cxx | 11
reportdesign/source/filter/xml/xmlFormattedField.cxx | 4
reportdesign/source/filter/xml/xmlGroup.cxx | 8
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 2
reportdesign/source/filter/xml/xmlfilter.cxx | 10
sax/source/tools/converter.cxx | 10
sc/source/core/tool/compiler.cxx | 2
sc/source/filter/excel/xltoolbar.cxx | 4
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 4
sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx | 7
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx | 7
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx | 4
sc/source/ui/StatisticsDialogs/FTestDialog.cxx | 9
sc/source/ui/StatisticsDialogs/TTestDialog.cxx | 9
sc/source/ui/docshell/impex.cxx | 4
sc/source/ui/vba/vbaapplication.cxx | 3
sc/source/ui/vba/vbaborders.cxx | 2
sc/source/ui/vba/vbaformatconditions.cxx | 10
sc/source/ui/vba/vbainterior.cxx | 6
sc/source/ui/vba/vbarange.cxx | 55 +-
sc/source/ui/vba/vbastyle.cxx | 2
sc/source/ui/vba/vbawindow.cxx | 8
sc/source/ui/vba/vbaworkbooks.cxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 2
scaddins/source/analysis/analysis.cxx | 2
scripting/source/dlgprov/dlgevtatt.cxx | 4
scripting/source/dlgprov/dlgprov.cxx | 37 -
scripting/source/stringresource/stringresource.cxx | 8
scripting/source/vbaevents/eventhelper.cxx | 28 -
sd/source/filter/eppt/epptso.cxx | 14
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 3
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 10
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 10
sd/source/ui/slidesorter/controller/SlsListener.cxx | 4
sd/source/ui/unoidl/DrawController.cxx | 2
sdext/source/minimizer/configurationaccess.cxx | 5
sdext/source/pdfimport/sax/saxattrlist.cxx | 5
sdext/source/pdfimport/wrapper/wrapper.cxx | 8
sfx2/source/appl/appinit.cxx | 3
sfx2/source/appl/appserv.cxx | 5
sfx2/source/dialog/filedlghelper.cxx | 6
sfx2/source/dialog/filtergrouping.cxx | 16
sfx2/source/doc/docfac.cxx | 14
svgio/inc/svgio/svgreader/svgtoken.hxx | 4
svgio/source/svgreader/svgtoken.cxx | 270 +++++-----
svgio/source/svgreader/svgtools.cxx | 50 -
svgio/source/svguno/xsvgparser.cxx | 7
svl/source/numbers/zforfind.cxx | 6
svtools/source/graphic/grfmgr.cxx | 2
svx/source/accessibility/AccessibleControlShape.cxx | 22
svx/source/accessibility/AccessibleGraphicShape.cxx | 3
svx/source/accessibility/AccessibleOLEShape.cxx | 3
svx/source/accessibility/AccessibleShape.cxx | 9
svx/source/accessibility/ChildrenManagerImpl.cxx | 4
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/form/fmobj.cxx | 2
svx/source/form/fmscriptingenv.cxx | 4
svx/source/form/fmundo.cxx | 2
svx/source/form/formcontroller.cxx | 2
svx/source/gallery2/gallery1.cxx | 8
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 3
svx/source/svdraw/svdoashp.cxx | 20
svx/source/svdraw/svdoole2.cxx | 2
svx/source/table/accessiblecell.cxx | 3
svx/source/toolbars/extrusionbar.cxx | 78 +-
svx/source/toolbars/fontworkbar.cxx | 6
svx/source/unodraw/unoshape.cxx | 6
sw/qa/tiledrendering/tiledrendering.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/unocore/unofield.cxx | 12
sw/source/filter/ww8/wrtw8esh.cxx | 6
sw/source/ui/vba/vbaapplication.cxx | 3
sw/source/ui/vba/vbafont.cxx | 3
toolkit/source/controls/controlmodelcontainerbase.cxx | 10
toolkit/source/controls/stdtabcontroller.cxx | 2
toolkit/source/controls/tabpagemodel.cxx | 2
toolkit/source/controls/tree/treedatamodel.cxx | 8
toolkit/source/helper/formpdfexport.cxx | 38 -
unotools/source/config/eventcfg.cxx | 12
unotools/source/misc/mediadescriptor.cxx | 4
unoxml/source/rdf/librdf_repository.cxx | 10
vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 4
vbahelper/source/vbahelper/vbahelper.cxx | 4
vcl/source/components/fontident.cxx | 4
vcl/source/font/PhysicalFontCollection.cxx | 4
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 4
writerfilter/source/dmapper/DomainMapper.cxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8
writerfilter/source/dmapper/FormControlHelper.cxx | 4
writerfilter/source/dmapper/OLEHandler.cxx | 6
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 24
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 92 +--
xmlhelp/source/treeview/tvread.cxx | 2
xmloff/source/draw/eventimp.cxx | 2
xmloff/source/forms/elementimport.cxx | 10
xmloff/source/forms/layerimport.cxx | 2
xmloff/source/text/XMLPropertyBackpatcher.cxx | 7
xmloff/source/text/XMLTextFrameContext.cxx | 8
xmloff/source/text/XMLTextListBlockContext.cxx | 2
xmloff/source/text/XMLTextListItemContext.cxx | 2
xmloff/source/text/XMLTextMarkImportContext.cxx | 12
xmloff/source/text/txtimp.cxx | 54 +-
xmloff/source/text/txtlists.cxx | 2
xmloff/source/text/txtparae.cxx | 10
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 54 --
xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 54 --
256 files changed, 1228 insertions(+), 1617 deletions(-)
New commits:
commit 705c48d32eec0aa5180e60ca157daca4b154e4a3
Author: Noel Grandin <noel at peralex.com>
Date: Mon Nov 3 14:03:54 2014 +0200
fdo#38835 strip out OUString globals
they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.
Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 443feb1..a24d05b 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -681,8 +681,7 @@ throw(RuntimeException, std::exception)
checkActionIndex_Impl( nIndex );
EnsureIsAlive();
- static const OUString sActionDesc( "Select" );
- return sActionDesc;
+ return OUString( "Select" );
}
Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 31f0947..fc296b4 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -819,8 +819,8 @@ namespace accessibility
checkActionIndex_Impl( nIndex );
EnsureIsAlive();
- static const OUString sActionDesc1( "Check" );
- static const OUString sActionDesc2( "UnCheck" );
+ static const char sActionDesc1[] = "Check";
+ static const char sActionDesc2[] = "UnCheck";
// sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0;
SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
SvButtonState state = getListBox()->GetCheckButtonState( pEntry );
@@ -830,9 +830,9 @@ namespace accessibility
if(getAccessibleRole() == AccessibleRole::CHECK_BOX)
{
if ( state == SV_BUTTON_CHECKED )
- return sActionDesc2;
+ return OUString(sActionDesc2);
else if (state == SV_BUTTON_UNCHECKED)
- return sActionDesc1;
+ return OUString(sActionDesc1);
}
else
{
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 8a1fd5c..b52bf85 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -275,8 +275,7 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex )
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
throw IndexOutOfBoundsException();
- static const OUString sAction( "activate" );
- return sAction;
+ return OUString( "activate" );
}
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 2e5d92f..a52199a 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -242,9 +242,9 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
::sfx2::FileDialogHelper aDlg( (o_pbLink)
? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW
: ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
- static const OUString aWildcard( "*." );
+ static const char aWildcard[] = "*.";
FilterNameVector aFilters;
- const OUString aSeparator( ";" );
+ static const char aSeparator[] = ";";
OUString aAllTypes;
aDlg.SetTitle( AVMEDIA_RESSTR( (o_pbLink)
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index bd238ba..b7b7915 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -702,8 +702,6 @@ void DialogWindow::UpdateBrowser()
rLayout.UpdatePropertyBrowser();
}
-static OUString aResourceResolverPropName( "ResourceResolver" );
-
bool DialogWindow::SaveDialog()
{
bool bDone = false;
@@ -771,7 +769,7 @@ bool DialogWindow::SaveDialog()
{
try
{
- Any aResourceResolver = xDialogModelPropSet->getPropertyValue( aResourceResolverPropName );
+ Any aResourceResolver = xDialogModelPropSet->getPropertyValue( "ResourceResolver" );
aResourceResolver >>= xStringResourceResolver;
}
catch(const beans::UnknownPropertyException& )
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 98d0159..b994264 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1053,12 +1053,10 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe
void Shell::ManageToolbars()
{
- static OUString aLayoutManagerName( "LayoutManager" );
- static OUString aMacroBarResName( "private:resource/toolbar/macrobar" );
- static OUString aDialogBarResName( "private:resource/toolbar/dialogbar" );
- static OUString aInsertControlsBarResName( "private:resource/toolbar/insertcontrolsbar" );
- static OUString aFormControlsBarResName( "private:resource/toolbar/formcontrolsbar" );
- (void)aInsertControlsBarResName;
+ static const char aMacroBarResName[] = "private:resource/toolbar/macrobar";
+ static const char aDialogBarResName[] = "private:resource/toolbar/dialogbar";
+ static const char aInsertControlsBarResName[] = "private:resource/toolbar/insertcontrolsbar";
+ static const char aFormControlsBarResName[] = "private:resource/toolbar/formcontrolsbar";
if( !pCurWin )
return;
@@ -1068,7 +1066,7 @@ void Shell::ManageToolbars()
if ( xFrameProps.is() )
{
Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
- uno::Any a = xFrameProps->getPropertyValue( aLayoutManagerName );
+ uno::Any a = xFrameProps->getPropertyValue( "LayoutManager" );
a >>= xLayoutManager;
if ( xLayoutManager.is() )
{
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index bc44262..80c11b0 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -69,8 +69,8 @@ bool LocalizationMgr::isLibraryLocalized ()
void LocalizationMgr::handleTranslationbar ()
{
- static OUString const aLayoutManagerName("LayoutManager");
- static OUString const aToolBarResName("private:resource/toolbar/translationbar");
+ static const char aLayoutManagerName[] = "LayoutManager";
+ static const char aToolBarResName[] = "private:resource/toolbar/translationbar";
Reference< beans::XPropertySet > xFrameProps
( m_pShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
@@ -902,7 +902,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName,
const OUString& aDlgName, Reference< container::XNameContainer > xDialogModel )
{
- static OUString aResourceResolverPropName( "ResourceResolver" );
+ static const char aResourceResolverPropName[] = "ResourceResolver";
// Get library
Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, true ) );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index ba1a87a..b6d525c 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -57,9 +57,9 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::io;
-static OUString aResourceResolverPropName( "ResourceResolver" );
-static OUString aDecorationPropName( "Decoration" );
-static OUString aTitlePropName( "Title" );
+static const char aResourceResolverPropName[] = "ResourceResolver";
+static const char aDecorationPropName[] = "Decoration";
+static const char aTitlePropName[] = "Title";
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index c7346c8..e38c266 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -130,7 +130,7 @@ void PropBrw::ImplReCreateController()
// create a property browser controller
Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_QUERY_THROW );
- static const OUString s_sControllerServiceName( "com.sun.star.awt.PropertyBrowserController" );
+ static const char s_sControllerServiceName[] = "com.sun.star.awt.PropertyBrowserController";
m_xBrowserController = Reference< XPropertySet >(
xFactory->createInstanceWithContext( s_sControllerServiceName, xInspectorContext ), UNO_QUERY
);
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index d5843fe..64f88a2 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -156,8 +156,7 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any
OUString SAL_CALL
ErrObject::getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception)
{
- static OUString sDfltPropName( "Number" );
- return sDfltPropName;
+ return OUString( "Number" );
}
void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext )
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 0ff6393..13bc3dc 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4242,7 +4242,7 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
(void)pBasic;
(void)bWrite;
- static OUString aTypeTypeString( "type" );
+ static const char aTypeTypeString[] = "type";
// 2 parameters needed
if ( rPar.Count() != 3 )
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 351508c..7d4ae67 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -732,9 +732,7 @@ SbxVariable* SbModule::Find( const OUString& rName, SbxClassType t )
const OUString& SbModule::GetSource() const
{
- static OUString aRetStr;
- aRetStr = aOUSource;
- return aRetStr;
+ return aOUSource;
}
// Parent and BASIC are one!
@@ -1000,29 +998,25 @@ static void SendHint( SbxObject* pObj, sal_uIntPtr nId, SbMethod* p )
void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
{
// delete the return value of CreateUnoService
- static OUString aName("CreateUnoService");
- SbxVariable* pVar = pBasic->GetRtl()->Find( aName, SbxCLASS_METHOD );
+ SbxVariable* pVar = pBasic->GetRtl()->Find( OUString("CreateUnoService"), SbxCLASS_METHOD );
if( pVar )
{
pVar->SbxValue::Clear();
}
// delete the return value of CreateUnoDialog
- static OUString aName2("CreateUnoDialog");
- pVar = pBasic->GetRtl()->Find( aName2, SbxCLASS_METHOD );
+ pVar = pBasic->GetRtl()->Find( OUString("CreateUnoDialog"), SbxCLASS_METHOD );
if( pVar )
{
pVar->SbxValue::Clear();
}
// delete the return value of CDec
- static OUString aName3("CDec");
- pVar = pBasic->GetRtl()->Find( aName3, SbxCLASS_METHOD );
+ pVar = pBasic->GetRtl()->Find( OUString("CDec"), SbxCLASS_METHOD );
if( pVar )
{
pVar->SbxValue::Clear();
}
// delete return value of CreateObject
- static OUString aName4("CreateObject");
- pVar = pBasic->GetRtl()->Find( aName4, SbxCLASS_METHOD );
+ pVar = pBasic->GetRtl()->Find( OUString("CreateObject"), SbxCLASS_METHOD );
if( pVar )
{
pVar->SbxValue::Clear();
@@ -2548,29 +2542,25 @@ void SbUserFormModule::triggerInitializeEvent( void )
if ( mbInit )
return;
SAL_INFO("basic", "**** SbUserFormModule::triggerInitializeEvent");
- static OUString aInitMethodName( "Userform_Initialize");
- triggerMethod( aInitMethodName );
+ triggerMethod(OUString("Userform_Initialize"));
mbInit = true;
}
void SbUserFormModule::triggerTerminateEvent( void )
{
SAL_INFO("basic", "**** SbUserFormModule::triggerTerminateEvent");
- static OUString aTermMethodName( "Userform_Terminate" );
- triggerMethod( aTermMethodName );
+ triggerMethod(OUString( "Userform_Terminate" ));
mbInit=false;
}
void SbUserFormModule::triggerLayoutEvent( void )
{
- static OUString aMethodName( "Userform_Layout" );
- triggerMethod( aMethodName );
+ triggerMethod(OUString( "Userform_Layout" ));
}
void SbUserFormModule::triggerResizeEvent( void )
{
- static OUString aMethodName("Userform_Resize");
- triggerMethod( aMethodName );
+ triggerMethod(OUString("Userform_Resize"));
}
SbUserFormModuleInstance* SbUserFormModule::CreateInstance()
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 5efb1f0..4f0b6d7 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -40,7 +40,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.Area" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Area";
struct StaticAreaWrapperPropertyArray_Initializer
{
@@ -179,7 +179,7 @@ Sequence< OUString > AreaWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( AreaWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( AreaWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 4643d6c..10da0e7 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -63,7 +63,7 @@ using ::com::sun::star::uno::Any;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.Axis" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Axis";
enum
{
@@ -694,7 +694,7 @@ Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( AxisWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( AxisWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 0689070..2acabf8 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -61,7 +61,7 @@ using ::com::sun::star::chart::XDateCategories;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ChartData" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.ChartData";
uno::Sequence< uno::Sequence< double > > lcl_getNANInsteadDBL_MIN( const uno::Sequence< uno::Sequence< double > >& rData )
{
@@ -726,7 +726,7 @@ uno::Sequence< OUString > ChartDataWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ChartDataWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( ChartDataWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index a897eb7..dfd565e 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -65,7 +65,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.DataSeries" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.DataSeries";
enum
{
@@ -881,7 +881,7 @@ uno::Sequence< OUString > DataSeriesPointWrapper::getSupportedServiceNames_Stati
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( DataSeriesPointWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( DataSeriesPointWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 6fde3c4..a2c544f 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -79,7 +79,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.Diagram" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Diagram";
enum
{
@@ -2081,7 +2081,7 @@ uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( DiagramWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( DiagramWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 57efc98..e432ddc 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -44,7 +44,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.Grid" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Grid";
struct StaticGridWrapperPropertyArray_Initializer
{
@@ -185,7 +185,7 @@ Sequence< OUString > GridWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( GridWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( GridWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index e069fc2..cbb734b 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -210,7 +210,7 @@ Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterV
namespace
{
-static const OUString lcl_aServiceName("com.sun.star.comp.chart.Legend");
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Legend";
enum
{
@@ -432,7 +432,7 @@ Sequence< OUString > LegendWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( LegendWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( LegendWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 841df09..5455758 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -41,7 +41,7 @@ using ::com::sun::star::uno::Any;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ChartLine" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.ChartLine";
struct StaticMinMaxLineWrapperDefaults_Initializer
{
@@ -418,7 +418,7 @@ Sequence< OUString > MinMaxLineWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( MinMaxLineWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( MinMaxLineWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 5197a09..aaa0c66 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -127,7 +127,7 @@ WrappedStackedTextProperty::~WrappedStackedTextProperty()
namespace
{
-static const OUString lcl_aServiceName("com.sun.star.comp.chart.Title");
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.Title";
enum
{
@@ -523,7 +523,7 @@ Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( TitleWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( TitleWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index e3be3b9..57de5508 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -41,7 +41,7 @@ using ::com::sun::star::uno::Any;
namespace
{
-static const OUString lcl_aServiceName("com.sun.star.comp.chart.ChartArea");
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.ChartArea";
struct StaticUpDownBarWrapperPropertyArray_Initializer
{
@@ -382,7 +382,7 @@ Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( UpDownBarWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( UpDownBarWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 701b86c..58c629b 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -44,7 +44,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.WallOrFloor" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.WallOrFloor";
struct StaticWallFloorWrapperPropertyArray_Initializer
{
@@ -166,7 +166,7 @@ Sequence< OUString > WallFloorWrapper::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( WallFloorWrapper, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( WallFloorWrapper, OUString(lcl_aServiceName) );
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 1092b58..b7a66ec 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -64,7 +64,7 @@ WrappedScaleTextProperty::~WrappedScaleTextProperty()
void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- static const OUString aRefSizeName( "ReferencePageSize" );
+ static const char aRefSizeName[] = "ReferencePageSize";
if( xInnerPropertySet.is() )
{
@@ -95,7 +95,7 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R
Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- static const OUString aRefSizeName( "ReferencePageSize" );
+ static const char aRefSizeName[] = "ReferencePageSize";
Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
if( xInnerPropertySet.is() )
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 76657d5..df2c602 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -47,7 +47,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ElementSelectorToolbarController" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.ElementSelectorToolbarController";
}
SelectorListBox::SelectorListBox( vcl::Window* pParent, WinBits nStyle )
@@ -246,7 +246,7 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, OUString(lcl_aServiceName) );
Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
{
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index a345bd9..06ae430 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -59,7 +59,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.Axis" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.Axis";
enum
{
@@ -637,7 +637,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( Axis, Axis_Base, ::property::OPropertySet )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet )
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( Axis, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( Axis, OUString(lcl_aServiceName) );
} // namespace chart
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index d5f2ed6..2339be6 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -30,11 +30,11 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const OUString lcl_aServiceNameCartesian2d( "com.sun.star.chart2.CartesianCoordinateSystem2d" );
-static const OUString lcl_aServiceNameCartesian3d( "com.sun.star.chart2.CartesianCoordinateSystem3d" );
+static const char lcl_aServiceNameCartesian2d[] = "com.sun.star.chart2.CartesianCoordinateSystem2d";
+static const char lcl_aServiceNameCartesian3d[] = "com.sun.star.chart2.CartesianCoordinateSystem3d";
-static const OUString lcl_aImplementationNameCartesian2d( "com.sun.star.comp.chart2.CartesianCoordinateSystem2d" );
-static const OUString lcl_aImplementationNameCartesian3d( "com.sun.star.comp.chart2.CartesianCoordinateSystem3d" );
+static const char lcl_aImplementationNameCartesian2d[] = "com.sun.star.comp.chart2.CartesianCoordinateSystem2d";
+static const char lcl_aImplementationNameCartesian3d[] = "com.sun.star.comp.chart2.CartesianCoordinateSystem3d";
}
namespace chart
@@ -108,7 +108,7 @@ Sequence< OUString > CartesianCoordinateSystem2d::getSupportedServiceNames_Stati
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem2d, lcl_aImplementationNameCartesian2d )
+APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem2d, OUString(lcl_aImplementationNameCartesian2d) )
// ==== CartesianCoordinateSystem3d ====
@@ -130,7 +130,7 @@ Sequence< OUString > CartesianCoordinateSystem3d::getSupportedServiceNames_Stati
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem3d, lcl_aImplementationNameCartesian3d )
+APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem3d, OUString(lcl_aImplementationNameCartesian3d) )
} // namespace chart
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index f7a2824..f42c0e7 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -38,7 +38,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.GridProperties" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.GridProperties";
enum
{
@@ -243,7 +243,7 @@ Sequence< OUString > GridProperties::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( GridProperties, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( GridProperties, OUString(lcl_aServiceName) );
// needed by MSC compiler
using impl::GridProperties_Base;
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index a0d885c..be21cd9 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -47,7 +47,7 @@ using ::com::sun::star::beans::Property;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.Legend" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.Legend";
enum
{
@@ -301,7 +301,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( Legend, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( Legend, OUString(lcl_aServiceName) );
// needed by MSC compiler
using impl::Legend_Base;
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 3b72c38..d9eea37 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -40,7 +40,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.PageBackground" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.PageBackground";
struct StaticPageBackgroundDefaults_Initializer
{
@@ -223,7 +223,7 @@ uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( PageBackground, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( PageBackground, OUString(lcl_aServiceName) );
using impl::PageBackground_Base;
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index 3a82754..a48744a 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -30,11 +30,11 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const OUString lcl_aServiceNamePolar2d( "com.sun.star.chart2.PolarCoordinateSystem2d" );
-static const OUString lcl_aServiceNamePolar3d( "com.sun.star.chart2.PolarCoordinateSystem3d" );
+static const char lcl_aServiceNamePolar2d[] = "com.sun.star.chart2.PolarCoordinateSystem2d";
+static const char lcl_aServiceNamePolar3d[] = "com.sun.star.chart2.PolarCoordinateSystem3d";
-static const OUString lcl_aImplementationNamePolar2d( "com.sun.star.comp.chart2.PolarCoordinateSystem2d" );
-static const OUString lcl_aImplementationNamePolar3d( "com.sun.star.comp.chart2.PolarCoordinateSystem3d" );
+static const char lcl_aImplementationNamePolar2d[] = "com.sun.star.comp.chart2.PolarCoordinateSystem2d";
+static const char lcl_aImplementationNamePolar3d[] = "com.sun.star.comp.chart2.PolarCoordinateSystem3d";
}
namespace chart
@@ -108,7 +108,7 @@ Sequence< OUString > PolarCoordinateSystem2d::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem2d, lcl_aImplementationNamePolar2d )
+APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem2d, OUString(lcl_aImplementationNamePolar2d) )
// ==== PolarCoordinateSystem3d ====
@@ -130,7 +130,7 @@ Sequence< OUString > PolarCoordinateSystem3d::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem3d, lcl_aImplementationNamePolar3d )
+APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem3d, OUString(lcl_aImplementationNamePolar3d) )
} // namespace chart
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 35ee200..d3cac0d 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -46,7 +46,7 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.Title" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.Title";
enum
{
@@ -374,7 +374,7 @@ uno::Sequence< OUString > Title::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( Title, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( Title, OUString(lcl_aServiceName) );
// needed by MSC compiler
using impl::Title_Base;
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 13ce0b8..8c9e8db 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -46,7 +46,7 @@ using ::chart::impl::CachedDataSequence_Base;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.CachedDataSequence" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.CachedDataSequence";
enum
{
@@ -260,7 +260,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, lcl_aServiceName )
+APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, OUString(lcl_aServiceName) )
// ________ XNumericalDataSequence ________
Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index f448c31..b5d2274 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -34,7 +34,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const OUString aSeriesPropName( "Series" );
+static const char aSeriesPropName[] = "Series";
} // anonymous namespace
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index f815711..24f8b51 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.DataSource" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.DataSource";
} // anonymous namespace
namespace chart
@@ -69,7 +69,7 @@ Sequence< OUString > DataSource::getSupportedServiceNames_Static()
return aServices;
}
-APPHELPER_XSERVICEINFO_IMPL( DataSource, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( DataSource, OUString(lcl_aServiceName) );
} // namespace chart
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index ea675b9..f3c5abc 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart2.ErrorBar" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.ErrorBar";
bool lcl_isInternalData( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{
@@ -468,7 +468,7 @@ uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ErrorBar, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( ErrorBar, OUString(lcl_aServiceName) );
// needed by MSC compiler
using impl::ErrorBar_Base;
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index ee2dcfe..1452af7 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -59,14 +59,14 @@ namespace
{
// note: in xmloff this name is used to indicate usage of own data
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.InternalDataProvider" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.InternalDataProvider";
-static const OUString lcl_aCategoriesRangeName( "categories" );
-static const OUString lcl_aCategoriesLevelRangeNamePrefix( "categoriesL " ); //L <-> level
-static const OUString lcl_aCategoriesPointRangeNamePrefix( "categoriesP " ); //P <-> point
-static const OUString lcl_aCategoriesRoleName( "categories" );
-static const OUString lcl_aLabelRangePrefix( "label " );
-static const OUString lcl_aCompleteRange( "all" );
+static const char lcl_aCategoriesRangeName[] = "categories";
+static const char lcl_aCategoriesLevelRangeNamePrefix[] = "categoriesL "; //L <-> level
+static const char lcl_aCategoriesPointRangeNamePrefix[] = "categoriesP "; //P <-> point
+static const char lcl_aCategoriesRoleName[] = "categories";
+static const char lcl_aLabelRangePrefix[] = "label ";
+static const char lcl_aCompleteRange[] = "all";
typedef ::std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > >
lcl_tSequenceMap;
@@ -780,7 +780,7 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
{
Sequence< beans::PropertyValue > aArguments( 4 );
aArguments[0] = beans::PropertyValue(
- "CellRangeRepresentation", -1, uno::makeAny( lcl_aCompleteRange ),
+ "CellRangeRepresentation", -1, uno::makeAny( OUString(lcl_aCompleteRange) ),
beans::PropertyState_DIRECT_VALUE );
aArguments[1] = beans::PropertyValue(
"DataRowSource", -1, uno::makeAny(
@@ -821,7 +821,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
else if( aRangeRepresentation.match( lcl_aLabelRangePrefix ))
{
// label
- sal_Int32 nIndex = aRangeRepresentation.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
+ sal_Int32 nIndex = aRangeRepresentation.copy( strlen(lcl_aLabelRangePrefix)).toInt32();
return createDataSequenceAndAddToMap( lcl_aLabelRangePrefix + OUString::number( nIndex ));
}
else if ( aRangeRepresentation == "last" )
@@ -868,7 +868,7 @@ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUSt
}
else if( aRange.match( lcl_aLabelRangePrefix ))
{
- sal_Int32 nIndex = aRange.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
+ sal_Int32 nIndex = aRange.copy( strlen(lcl_aLabelRangePrefix)).toInt32();
bResult = (nIndex < (m_bDataInColumns ? m_aInternalData.getColumnCount(): m_aInternalData.getRowCount()));
}
else
@@ -887,7 +887,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
if( aRange.match( lcl_aLabelRangePrefix ) )
{
- sal_Int32 nIndex = aRange.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
+ sal_Int32 nIndex = aRange.copy( strlen(lcl_aLabelRangePrefix)).toInt32();
vector< uno::Any > aComplexLabel = m_bDataInColumns
? m_aInternalData.getComplexColumnLabel( nIndex )
: m_aInternalData.getComplexRowLabel( nIndex );
@@ -896,7 +896,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
}
else if( aRange.match( lcl_aCategoriesPointRangeNamePrefix ) )
{
- sal_Int32 nPointIndex = aRange.copy( lcl_aCategoriesPointRangeNamePrefix.getLength() ).toInt32();
+ sal_Int32 nPointIndex = aRange.copy( strlen(lcl_aCategoriesPointRangeNamePrefix) ).toInt32();
vector< uno::Any > aComplexCategory = m_bDataInColumns
? m_aInternalData.getComplexRowLabel( nPointIndex )
: m_aInternalData.getComplexColumnLabel( nPointIndex );
@@ -905,7 +905,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
}
else if( aRange.match( lcl_aCategoriesLevelRangeNamePrefix ) )
{
- sal_Int32 nLevel = aRange.copy( lcl_aCategoriesLevelRangeNamePrefix.getLength() ).toInt32();
+ sal_Int32 nLevel = aRange.copy( strlen(lcl_aCategoriesLevelRangeNamePrefix) ).toInt32();
vector< vector< uno::Any > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
if( nLevel < lcl_getInnerLevelCount( aCategories ) )
{
@@ -960,7 +960,7 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) );
if( aRange.match( lcl_aLabelRangePrefix ) )
{
- sal_uInt32 nIndex = aRange.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
+ sal_uInt32 nIndex = aRange.copy( strlen(lcl_aLabelRangePrefix)).toInt32();
if( m_bDataInColumns )
m_aInternalData.setComplexColumnLabel( nIndex, aNewVector );
else
@@ -968,7 +968,7 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
}
else if( aRange.match( lcl_aCategoriesPointRangeNamePrefix ) )
{
- sal_Int32 nPointIndex = aRange.copy( lcl_aCategoriesLevelRangeNamePrefix.getLength()).toInt32();
+ sal_Int32 nPointIndex = aRange.copy( strlen(lcl_aCategoriesLevelRangeNamePrefix)).toInt32();
if( m_bDataInColumns )
m_aInternalData.setComplexRowLabel( nPointIndex, aNewVector );
else
@@ -976,7 +976,7 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
}
else if( aRange.match( lcl_aCategoriesLevelRangeNamePrefix ) )
{
- sal_Int32 nLevel = aRange.copy( lcl_aCategoriesLevelRangeNamePrefix.getLength()).toInt32();
+ sal_Int32 nLevel = aRange.copy( strlen(lcl_aCategoriesLevelRangeNamePrefix)).toInt32();
vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
//ensure equal length
@@ -1204,7 +1204,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang
}
else if( aRangeRepresentation.match( lcl_aLabelRangePrefix ))
{
- sal_Int32 nIndex = aRangeRepresentation.copy( lcl_aLabelRangePrefix.getLength()).toInt32();
+ sal_Int32 nIndex = aRangeRepresentation.copy( strlen(lcl_aLabelRangePrefix)).toInt32();
aRange.aUpperLeft.bIsEmpty = false;
aRange.aLowerRight.bIsEmpty = true;
if( m_bDataInColumns )
@@ -1265,7 +1265,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
if( !aRange.aLowerRight.bIsEmpty &&
( aRange.aUpperLeft.nColumn != aRange.aLowerRight.nColumn ) &&
( aRange.aUpperLeft.nRow != aRange.aLowerRight.nRow ) )
- return lcl_aCompleteRange;
+ return OUString(lcl_aCompleteRange);
// attention: this data provider has the limitation that it stores
// internally if data comes from columns or rows. It is intended for
@@ -1276,7 +1276,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
if( m_bDataInColumns )
{
if( aRange.aUpperLeft.nColumn == 0 )
- return lcl_aCategoriesRangeName;
+ return OUString(lcl_aCategoriesRangeName);
if( aRange.aUpperLeft.nRow == 0 )
return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nColumn - 1 );
@@ -1285,7 +1285,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
// data in rows
if( aRange.aUpperLeft.nRow == 0 )
- return lcl_aCategoriesRangeName;
+ return OUString(lcl_aCategoriesRangeName);
if( aRange.aUpperLeft.nColumn == 0 )
return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nRow - 1 );
@@ -1549,7 +1549,7 @@ Sequence< OUString > InternalDataProvider::getSupportedServiceNames_Static()
return aServices;
}
-APPHELPER_XSERVICEINFO_IMPL( InternalDataProvider, lcl_aServiceName );
+APPHELPER_XSERVICEINFO_IMPL( InternalDataProvider, OUString(lcl_aServiceName) );
} // namespace chart
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 638ca06..d3b480f 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -46,12 +46,11 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
-static OUString m_aMultiClick( "MultiClick" );
-static OUString m_aDragMethodEquals( "DragMethod=" );
-static OUString m_aDragParameterEquals( "DragParameter=" );
-static OUString m_aProtocol( "CID/" );
-static OUString m_aEmptyString;
-static OUString m_aPieSegmentDragMethodServiceName( "PieSegmentDraging" );
+static const char m_aMultiClick[] = "MultiClick";
+static const char m_aDragMethodEquals[] = "DragMethod=";
+static const char m_aDragParameterEquals[] = "DragParameter=";
+static const char m_aProtocol[] = "CID/";
+static const OUString m_aPieSegmentDragMethodServiceName("PieSegmentDraging");
namespace
{
@@ -507,7 +506,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
OUStringBuffer aRet( m_aProtocol );
aRet.append( lcl_createClassificationStringForType( eObjectType, rDragMethodServiceName, rDragParameterString ));
- if(aRet.getLength()>m_aProtocol.getLength())
+ if(aRet.getLength() > (sal_Int32)strlen(m_aProtocol))
aRet.appendAscii("/");
if(!rParentParticle.isEmpty())
@@ -525,18 +524,16 @@ OUString ObjectIdentifier::createParticleForDiagram(
const Reference< XDiagram >& /*xDiagram*/
, ChartModel& /*xChartModel*/ )
{
- static OUString aRet("D=0");
//todo: if more than one diagram is implemeted, add the correct diagram index here
- return aRet;
+ return OUString("D=0");
}
OUString ObjectIdentifier::createParticleForDiagram(
const Reference< XDiagram >& /*xDiagram*/
, const Reference< frame::XModel >& /*xChartModel*/ )
{
- static OUString aRet("D=0");
//todo: if more than one diagram is implemeted, add the correct diagram index here
- return aRet;
+ return OUString("D=0");
}
OUString ObjectIdentifier::createParticleForCoordinateSystem(
@@ -698,7 +695,7 @@ OUString ObjectIdentifier::createClassifiedIdentifier(
, const OUString& rParticleID )//e.g. SeriesID
{
return createClassifiedIdentifierWithParent(
- eObjectType, rParticleID, m_aEmptyString );
+ eObjectType, rParticleID, OUString() );
}
OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
@@ -714,7 +711,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
OUStringBuffer aRet( m_aProtocol );
aRet.append( lcl_createClassificationStringForType( eObjectType, rDragMethodServiceName, rDragParameterString ));
- if(aRet.getLength()>m_aProtocol.getLength())
+ if(aRet.getLength() > (sal_Int32)strlen(m_aProtocol))
aRet.appendAscii("/");
aRet.append(rParentPartical);
if(!rParentPartical.isEmpty())
@@ -896,7 +893,7 @@ bool ObjectIdentifier::isMultiClickObject( const OUString& rClassifiedIdentifier
//was selected before;
//!!!!! by definition the name of a MultiClickObject starts with "CID/MultiClick:"
- bool bRet = rClassifiedIdentifier.match( m_aMultiClick, m_aProtocol.getLength() );
+ bool bRet = rClassifiedIdentifier.match( m_aMultiClick, strlen(m_aProtocol) );
return bRet;
}
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 268c3d1..d612707 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -133,7 +133,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
if( ! xProp.is())
return;
- static const OUString aRefSizeName( "ReferencePageSize" );
+ static const char aRefSizeName[] = "ReferencePageSize";
try
{
@@ -168,7 +168,7 @@ void ReferenceSizeProvider::getAutoResizeFromPropSet(
const Reference< beans::XPropertySet > & xProp,
ReferenceSizeProvider::AutoResizeState & rInOutState )
{
- static const OUString aRefSizeName( "ReferencePageSize" );
+ static const char aRefSizeName[] = "ReferencePageSize";
AutoResizeState eSingleState = AUTO_RESIZE_UNKNOWN;
if( xProp.is())
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index 694e056..d7be7b6 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -55,17 +55,15 @@ bool RegressionCurveCalculator::isLinearScaling(
// no scaling means linear
if( !xScaling.is())
return true;
- static OUString aLinScalingServiceName( "com.sun.star.chart2.LinearScaling" );
uno::Reference< lang::XServiceName > xServiceName( xScaling, uno::UNO_QUERY );
- return (xServiceName.is() && xServiceName->getServiceName().equals( aLinScalingServiceName ));
+ return (xServiceName.is() && xServiceName->getServiceName().equals( "com.sun.star.chart2.LinearScaling" ));
}
bool RegressionCurveCalculator::isLogarithmicScaling(
const Reference< chart2::XScaling > & xScaling )
{
- static OUString aLogScalingServiceName( "com.sun.star.chart2.LogarithmicScaling" );
uno::Reference< lang::XServiceName > xServiceName( xScaling, uno::UNO_QUERY );
- return (xServiceName.is() && xServiceName->getServiceName().equals( aLogScalingServiceName ));
+ return (xServiceName.is() && xServiceName->getServiceName().equals( "com.sun.star.chart2.LogarithmicScaling" ));
}
void RegressionCurveCalculator::setRegressionProperties(
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 755b1da..a29d7d5 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -45,8 +45,8 @@ using ::osl::MutexGuard;
namespace
{
-static const OUString lcl_aImplementationName( "com.sun.star.comp.chart2.RegressionEquation" );
-static const OUString lcl_aServiceName( "com.sun.star.chart2.RegressionEquation" );
+static const char lcl_aImplementationName[] = "com.sun.star.comp.chart2.RegressionEquation";
+static const char lcl_aServiceName[] = "com.sun.star.chart2.RegressionEquation";
enum
{
@@ -315,7 +315,7 @@ uno::Sequence< OUString > RegressionEquation::getSupportedServiceNames_Static()
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( RegressionEquation, lcl_aImplementationName );
+APPHELPER_XSERVICEINFO_IMPL( RegressionEquation, OUString(lcl_aImplementationName) );
using impl::RegressionEquation_Base;
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index e30f8d0..2b4ea67 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -24,10 +24,10 @@
namespace
{
-static const OUString lcl_aServiceName_Logarithmic( "com.sun.star.chart2.LogarithmicScaling" );
-static const OUString lcl_aServiceName_Exponential( "com.sun.star.chart2.ExponentialScaling" );
-static const OUString lcl_aServiceName_Linear( "com.sun.star.chart2.LinearScaling" );
-static const OUString lcl_aServiceName_Power( "com.sun.star.chart2.PowerScaling" );
+static const char lcl_aServiceName_Logarithmic[] = "com.sun.star.chart2.LogarithmicScaling";
+static const char lcl_aServiceName_Exponential[] = "com.sun.star.chart2.ExponentialScaling";
+static const char lcl_aServiceName_Linear[] = "com.sun.star.chart2.LinearScaling";
+static const char lcl_aServiceName_Power[] = "com.sun.star.chart2.PowerScaling";
}
@@ -53,8 +53,7 @@ LogarithmicScaling::~LogarithmicScaling()
{
}
- double SAL_CALL
-LogarithmicScaling::doScaling( double value )
+double SAL_CALL LogarithmicScaling::doScaling( double value )
throw (uno::RuntimeException, std::exception)
{
double fResult;
@@ -65,27 +64,27 @@ LogarithmicScaling::doScaling( double value )
return fResult;
}
- uno::Reference< XScaling > SAL_CALL
-LogarithmicScaling::getInverseScaling()
+uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling()
throw (uno::RuntimeException, std::exception)
{
return new ExponentialScaling( m_fBase );
}
- OUString SAL_CALL
-LogarithmicScaling::getServiceName()
+OUString SAL_CALL LogarithmicScaling::getServiceName()
throw (uno::RuntimeException, std::exception)
{
- return lcl_aServiceName_Logarithmic;
+ return OUString(lcl_aServiceName_Logarithmic);
}
uno::Sequence< OUString > LogarithmicScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< OUString >( & lcl_aServiceName_Logarithmic, 1 );
+ uno::Sequence< OUString > aSeq(1);
+ aSeq.getArray()[0] = lcl_aServiceName_Logarithmic;
+ return aSeq;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( LogarithmicScaling, lcl_aServiceName_Logarithmic )
+APPHELPER_XSERVICEINFO_IMPL( LogarithmicScaling, OUString(lcl_aServiceName_Logarithmic) )
ExponentialScaling::ExponentialScaling( const uno::Reference< uno::XComponentContext > & xContext ) :
m_fBase( 10.0 ),
@@ -102,8 +101,7 @@ ExponentialScaling::~ExponentialScaling()
{
}
- double SAL_CALL
-ExponentialScaling::doScaling( double value )
+double SAL_CALL ExponentialScaling::doScaling( double value )
throw (uno::RuntimeException, std::exception)
{
double fResult;
@@ -114,27 +112,27 @@ ExponentialScaling::doScaling( double value )
return fResult;
}
- uno::Reference< XScaling > SAL_CALL
-ExponentialScaling::getInverseScaling()
+uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling()
throw (uno::RuntimeException, std::exception)
{
return new LogarithmicScaling( m_fBase );
}
- OUString SAL_CALL
-ExponentialScaling::getServiceName()
+OUString SAL_CALL ExponentialScaling::getServiceName()
throw (uno::RuntimeException, std::exception)
{
- return lcl_aServiceName_Exponential;
+ return OUString(lcl_aServiceName_Exponential);
}
uno::Sequence< OUString > ExponentialScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< OUString >( & lcl_aServiceName_Exponential, 1 );
+ uno::Sequence< OUString > aSeq(1);
+ aSeq.getArray()[0] = lcl_aServiceName_Exponential;
+ return aSeq;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( ExponentialScaling, lcl_aServiceName_Exponential )
+APPHELPER_XSERVICEINFO_IMPL( ExponentialScaling, OUString(lcl_aServiceName_Exponential) )
LinearScaling::LinearScaling( const uno::Reference< uno::XComponentContext > & xContext ) :
m_fSlope( 1.0 ),
@@ -172,20 +170,21 @@ uno::Reference< XScaling > SAL_CALL
return new LinearScaling( 1.0 / m_fSlope, m_fOffset / m_fSlope );
}
- OUString SAL_CALL
-LinearScaling::getServiceName()
+OUString SAL_CALL LinearScaling::getServiceName()
throw (uno::RuntimeException, std::exception)
{
- return lcl_aServiceName_Linear;
+ return OUString(lcl_aServiceName_Linear);
}
uno::Sequence< OUString > LinearScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< OUString >( & lcl_aServiceName_Linear, 1 );
+ uno::Sequence< OUString > aSeq(1);
+ aSeq.getArray()[0] = lcl_aServiceName_Linear;
+ return aSeq;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( LinearScaling, lcl_aServiceName_Linear )
+APPHELPER_XSERVICEINFO_IMPL( LinearScaling, OUString(lcl_aServiceName_Linear) )
PowerScaling::PowerScaling( const uno::Reference< uno::XComponentContext > & xContext ) :
m_fExponent( 10.0 ),
@@ -225,16 +224,18 @@ uno::Reference< XScaling > SAL_CALL
PowerScaling::getServiceName()
throw (uno::RuntimeException, std::exception)
{
- return lcl_aServiceName_Power;
+ return OUString(lcl_aServiceName_Power);
}
uno::Sequence< OUString > PowerScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< OUString >( & lcl_aServiceName_Power, 1 );
+ uno::Sequence< OUString > aSeq(1);
+ aSeq.getArray()[0] = lcl_aServiceName_Power;
+ return aSeq;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( PowerScaling, lcl_aServiceName_Power )
+APPHELPER_XSERVICEINFO_IMPL( PowerScaling, OUString(lcl_aServiceName_Power) )
} //namespace chart
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 993e495..3ba14aa 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -40,7 +40,7 @@ using ::chart::impl::UncachedDataSequence_Base;
namespace
{
-static const OUString lcl_aServiceName( "com.sun.star.comp.chart.UncachedDataSequence" );
+static const char lcl_aServiceName[] = "com.sun.star.comp.chart.UncachedDataSequence";
enum
{
@@ -156,7 +156,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( UncachedDataSequence, lcl_aServiceName )
+APPHELPER_XSERVICEINFO_IMPL( UncachedDataSequence, OUString(lcl_aServiceName) )
// ________ XNumericalDataSequence ________
Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index 86eeea1..c493182 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -25,8 +25,8 @@
namespace
{
-static const OUString lcl_aServiceName_DateScaling( "com.sun.star.chart2.DateScaling" );
-static const OUString lcl_aServiceName_InverseDateScaling( "com.sun.star.chart2.InverseDateScaling" );
+static const char lcl_aServiceName_DateScaling[] = "com.sun.star.chart2.DateScaling";
+static const char lcl_aServiceName_InverseDateScaling[] = "com.sun.star.chart2.InverseDateScaling";
static const double lcl_fNumberOfMonths = 12.0;//todo: this needs to be offered by basic tools Date class if it should be more generic
}
@@ -100,16 +100,18 @@ uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling()
OUString SAL_CALL DateScaling::getServiceName()
throw (uno::RuntimeException, std::exception)
{
- return lcl_aServiceName_DateScaling;
+ return OUString(lcl_aServiceName_DateScaling);
}
uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< OUString >( & lcl_aServiceName_DateScaling, 1 );
+ uno::Sequence< OUString > aSeq(1);
+ aSeq.getArray()[0] = lcl_aServiceName_DateScaling;
+ return aSeq;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( DateScaling, lcl_aServiceName_DateScaling )
+APPHELPER_XSERVICEINFO_IMPL( DateScaling, OUString(lcl_aServiceName_DateScaling) )
InverseDateScaling::InverseDateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted )
: m_aNullDate( rNullDate )
@@ -179,16 +181,18 @@ uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling()
OUString SAL_CALL InverseDateScaling::getServiceName()
throw (uno::RuntimeException, std::exception)
{
- return lcl_aServiceName_InverseDateScaling;
+ return OUString(lcl_aServiceName_InverseDateScaling);
}
uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< OUString >( & lcl_aServiceName_InverseDateScaling, 1 );
+ uno::Sequence< OUString > aSeq( 1 );
+ aSeq.getArray()[0] = lcl_aServiceName_InverseDateScaling;
+ return aSeq;
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( InverseDateScaling, lcl_aServiceName_InverseDateScaling )
+APPHELPER_XSERVICEINFO_IMPL( InverseDateScaling, OUString(lcl_aServiceName_InverseDateScaling) )
} //namespace chart
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index e59c407..d340157 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -129,14 +129,14 @@ namespace comphelper
namespace
{
- void lcl_replaceParameter( OUString& _inout_Message, const OUString& _rPlaceHolder, const OUString& _rReplacement )
+ void lcl_replaceParameter( OUString& _inout_Message, const char* _rPlaceHolder, const OUString& _rReplacement )
{
- sal_Int32 nPlaceholderPosition = _inout_Message.indexOf( _rPlaceHolder );
+ sal_Int32 nPlaceholderPosition = _inout_Message.indexOfAsciiL( _rPlaceHolder, strlen(_rPlaceHolder) );
OSL_ENSURE( nPlaceholderPosition >= 0, "lcl_replaceParameter: placeholder not found!" );
if ( nPlaceholderPosition < 0 )
return;
- _inout_Message = _inout_Message.replaceAt( nPlaceholderPosition, _rPlaceHolder.getLength(), _rReplacement );
+ _inout_Message = _inout_Message.replaceAt( nPlaceholderPosition, strlen(_rPlaceHolder), _rReplacement );
}
}
@@ -147,32 +147,24 @@ namespace comphelper
const OptionalString& _rArgument3, const OptionalString& _rArgument4,
const OptionalString& _rArgument5, const OptionalString& _rArgument6 ) const
{
- // (if OUString had an indexOfAscii, we could save those ugly statics ...)
- static OUString sPH1( "$1$" );
- static OUString sPH2( "$2$" );
- static OUString sPH3( "$3$" );
- static OUString sPH4( "$4$" );
- static OUString sPH5( "$5$" );
- static OUString sPH6( "$6$" );
-
OUString sMessage( _rMessage );
if ( !!_rArgument1 )
- lcl_replaceParameter( sMessage, sPH1, *_rArgument1 );
+ lcl_replaceParameter( sMessage, "$1$", *_rArgument1 );
if ( !!_rArgument2 )
- lcl_replaceParameter( sMessage, sPH2, *_rArgument2 );
+ lcl_replaceParameter( sMessage, "$2$", *_rArgument2 );
if ( !!_rArgument3 )
- lcl_replaceParameter( sMessage, sPH3, *_rArgument3 );
+ lcl_replaceParameter( sMessage, "$3$", *_rArgument3 );
if ( !!_rArgument4 )
- lcl_replaceParameter( sMessage, sPH4, *_rArgument4 );
+ lcl_replaceParameter( sMessage, "$4$", *_rArgument4 );
if ( !!_rArgument5 )
- lcl_replaceParameter( sMessage, sPH5, *_rArgument5 );
+ lcl_replaceParameter( sMessage, "$5$", *_rArgument5 );
if ( !!_rArgument6 )
- lcl_replaceParameter( sMessage, sPH6, *_rArgument6 );
+ lcl_replaceParameter( sMessage, "$6$", *_rArgument6 );
try
{
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 6df5a15..29b4606 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -67,8 +67,7 @@ css::uno::Any getNumberFormatDecimals(const css::uno::Reference<css::util::XNumb
css::uno::Reference<css::beans::XPropertySet> xFormat( xFormats->getByKey(nKey));
if (xFormat.is())
{
- static OUString PROPERTY_DECIMALS( "Decimals" );
- return xFormat->getPropertyValue(PROPERTY_DECIMALS);
+ return xFormat->getPropertyValue( "Decimals" );
}
}
catch(...)
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index 189e756..9157e33 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -29,8 +29,8 @@ namespace connectivity
if ( sStmt.startsWith("INSERT") )
{
sStatement = m_sGeneratedValueStatement;
- static const OUString sColumn("$column");
- static const OUString sTable("$table");
+ static const char sColumn[] = "$column";
+ static const char sTable[] = "$table";
sal_Int32 nIndex = 0;
nIndex = sStatement.indexOf(sColumn,nIndex);
if ( -1 != nIndex )
@@ -49,7 +49,7 @@ namespace connectivity
nIntoIndex = 0;
OUString sTableName = sStmt.getToken(0,' ',nIntoIndex);
- sStatement = sStatement.replaceAt(nIndex,sTable.getLength(),sTableName);
+ sStatement = sStatement.replaceAt(nIndex, strlen(sTable), sTableName);
}
}
return sStatement;
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index f762c64..ffcc941 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -288,10 +288,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
// and again a special treatment, this time for percent formats
if ((NumberFormat::NUMBER == nRealUsedTypeClass) && (NumberFormat::PERCENT == nTypeClass))
{ // formatting should be "percent", but the String provides just a simple number -> adjust
- OUString sExpanded(rString);
- static OUString s_sPercentSymbol( "%" );
- // need a method to add a sal_Unicode to a string, 'til then we use a static string
- sExpanded += s_sPercentSymbol;
+ OUString sExpanded = rString + "%";
fValue = xFormatter->convertStringToNumber(nKeyToUse, sExpanded);
}
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index 7804ad9..391f6ee 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -44,7 +44,7 @@ namespace
if ( aPropertiesNode.isValid() )
{
uno::Sequence< OUString > aStringSeq;
- static const OUString s_sValue("/Value");
+ static const char s_sValue[] = "/Value";
const uno::Sequence< OUString > aProperties = aPropertiesNode.getNodeNames();
const OUString* pPropertiesIter = aProperties.getConstArray();
const OUString* pPropertiesEnd = pPropertiesIter + aProperties.getLength();
@@ -97,7 +97,7 @@ void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rx
{
if ( !m_aInstalled.isValid() )
{
- static const OUString s_sNodeName("org.openoffice.Office.DataAccess.Drivers/Installed"); ///Installed
+ static const char s_sNodeName[] = "org.openoffice.Office.DataAccess.Drivers/Installed"; ///Installed
m_aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
}
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 4bf877a..1312e7e 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -122,14 +122,10 @@ namespace connectivity
Reference<XMultiServiceFactory> xFac(_xConnection,UNO_QUERY);
if ( xFac.is() )
{
- static const OUString s_sTableRename("TableRenameServiceName");
- m_xRename.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableRename)),UNO_QUERY);
- static const OUString s_sTableAlteration("TableAlterationServiceName");
- m_xAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableAlteration)),UNO_QUERY);
- static const OUString s_sKeyAlteration("KeyAlterationServiceName");
- m_xKeyAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sKeyAlteration)),UNO_QUERY);
- static const OUString s_sIndexAlteration("IndexAlterationServiceName");
- m_xIndexAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sIndexAlteration)),UNO_QUERY);
+ m_xRename.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,"TableRenameServiceName")),UNO_QUERY);
+ m_xAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,"TableAlterationServiceName")),UNO_QUERY);
+ m_xKeyAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,"KeyAlterationServiceName")),UNO_QUERY);
+ m_xIndexAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,"IndexAlterationServiceName")),UNO_QUERY);
}
}
catch(const Exception&)
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 7a72223..b5882d0 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -32,12 +32,7 @@ namespace dbtools
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
-
- static const OUString& getActiveConnectionPropertyName()
- {
- static const OUString s_sActiveConnectionPropertyName( "ActiveConnection" );
- return s_sActiveConnectionPropertyName;
- }
+ static const char ACTIVE_CONNECTION_PROPERTY_NAME[] = "ActiveConnection";
//= OAutoConnectionDisposer
@@ -56,7 +51,7 @@ namespace dbtools
try
{
- xProps->setPropertyValue( getActiveConnectionPropertyName(), makeAny( _rxConnection ) );
+ xProps->setPropertyValue( ACTIVE_CONNECTION_PROPERTY_NAME, makeAny( _rxConnection ) );
m_xOriginalConnection = _rxConnection;
startPropertyListening( xProps );
}
@@ -71,7 +66,7 @@ namespace dbtools
{
try
{
- _rxRowSet->addPropertyChangeListener( getActiveConnectionPropertyName(), this );
+ _rxRowSet->addPropertyChangeListener( ACTIVE_CONNECTION_PROPERTY_NAME, this );
m_bPropertyListening = true;
}
catch( const Exception& )
@@ -91,7 +86,7 @@ namespace dbtools
OSL_ENSURE( _rxEventSource.is(), "OAutoConnectionDisposer::stopPropertyListening: invalid event source (no XPropertySet)!" );
if ( _rxEventSource.is() )
{
- _rxEventSource->removePropertyChangeListener( getActiveConnectionPropertyName(), this );
+ _rxEventSource->removePropertyChangeListener( ACTIVE_CONNECTION_PROPERTY_NAME, this );
m_bPropertyListening = false;
}
}
@@ -135,7 +130,7 @@ namespace dbtools
void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception)
{
- if ( _rEvent.PropertyName.equals( getActiveConnectionPropertyName() ) )
+ if ( _rEvent.PropertyName == ACTIVE_CONNECTION_PROPERTY_NAME )
{ // somebody set a new ActiveConnection
Reference< XConnection > xNewConnection;
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index a5faf6f..7791385 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -694,15 +694,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
Reference< XRow > xCurrentRow(xPrivileges, UNO_QUERY);
const OUString sUserWorkingFor = _xMetaData->getUserName();
- static const OUString sSELECT( "SELECT" );
- static const OUString sINSERT( "INSERT" );
- static const OUString sUPDATE( "UPDATE" );
- static const OUString sDELETE( "DELETE" );
- static const OUString sREAD( "READ" );
- static const OUString sCREATE( "CREATE" );
- static const OUString sALTER( "ALTER" );
- static const OUString sREFERENCE( "REFERENCE" );
- static const OUString sDROP( "DROP" );
+ static const char sSELECT[] = "SELECT";
+ static const char sINSERT[] = "INSERT";
+ static const char sUPDATE[] = "UPDATE";
+ static const char sDELETE[] = "DELETE";
+ static const char sREAD[] = "READ";
+ static const char sCREATE[] = "CREATE";
+ static const char sALTER[] = "ALTER";
+ static const char sREFERENCE[] = "REFERENCE";
+ static const char sDROP[] = "DROP";
if ( xCurrentRow.is() )
{
@@ -800,9 +800,8 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
}
catch(const SQLException& e)
{
- static OUString sNotSupportedState( "IM001" );
// some drivers don't support any privileges so we assume that we are allowed to do all we want :-)
- if(e.SQLState == sNotSupportedState)
+ if(e.SQLState == "IM001")
nPrivileges |= Privilege::DROP |
Privilege::REFERENCE |
Privilege::ALTER |
@@ -965,20 +964,17 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour
}
OUString lcl_getReportEngines()
{
- static OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines");
- return s_sNodeName;
+ return OUString("org.openoffice.Office.DataAccess/ReportEngines");
}
OUString lcl_getDefaultReportEngine()
{
- static OUString s_sNodeName("DefaultReportEngine");
- return s_sNodeName;
+ return OUString("DefaultReportEngine");
}
OUString lcl_getReportEngineNames()
{
- static OUString s_sNodeName("ReportEngineNames");
- return s_sNodeName;
+ return OUString("ReportEngineNames");
}
OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& _rxORB)
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 9f9cbee..4fbd217 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -156,8 +156,8 @@ namespace dbtools
)
)
{
- static const OUString sSingleQuote( "'" );
- static const OUString sDoubleQuote( "''" );
+ static const char sSingleQuote[] = "'";
+ static const char sDoubleQuote[] = "''";
sal_Int32 nIndex = -1;
sal_Int32 nTemp = 0;
@@ -304,8 +304,8 @@ namespace dbtools
if ( bValidQuotedText )
{
sValue = sValue.copy( 1, sValue.getLength() - 2 );
- static const OUString sSingleQuote( "'" );
- static const OUString sDoubleQuote( "''" );
+ static const char sSingleQuote[] = "'";
+ static const char sDoubleQuote[] = "''";
sal_Int32 nIndex = -1;
sal_Int32 nTemp = 0;
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index e0e1f4c..6c4b8ed 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -48,16 +48,8 @@ void SAL_CALL OPoolTimer::onShot()
{
m_pPool->invalidatePooledConnections();
}
-namespace
-{
- static const OUString& getTimeoutNodeName()
- {
- static OUString s_sNodeName( "Timeout" );
- return s_sNodeName;
- }
-
-}
+static const char TIMEOUT_NODENAME[] = "Timeout";
//= OConnectionPool
@@ -78,9 +70,9 @@ OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
Reference<XPropertySet> xProp(m_xDriverNode,UNO_QUERY);
if(xProp.is())
- xProp->addPropertyChangeListener(getTimeoutNodeName(),this);
+ xProp->addPropertyChangeListener(TIMEOUT_NODENAME,this);
- OPoolCollection::getNodeValue(getTimeoutNodeName(),m_xDriverNode) >>= m_nALiveCount;
+ OPoolCollection::getNodeValue(TIMEOUT_NODENAME, m_xDriverNode) >>= m_nALiveCount;
calculateTimeOuts();
m_xInvalidator = new OPoolTimer(this,::salhelper::TTimeValue(m_nTimeOut,0));
@@ -161,7 +153,7 @@ void OConnectionPool::clear(bool _bDispose)
xComponent->removeEventListener(this);
Reference< XPropertySet > xProp(m_xDriverNode, UNO_QUERY);
if (xProp.is())
- xProp->removePropertyChangeListener(getTimeoutNodeName(),this);
+ xProp->removePropertyChangeListener(TIMEOUT_NODENAME, this);
m_xDriverNode.clear();
m_xDriver.clear();
@@ -302,7 +294,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite
void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- if(getTimeoutNodeName() == evt.PropertyName)
+ if(TIMEOUT_NODENAME == evt.PropertyName)
{
evt.NewValue >>= m_nALiveCount;
calculateTimeOuts();
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 2bc0bd5..9976b55 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -42,34 +42,29 @@ using namespace ::osl;
using namespace connectivity;
-static const OUString& getConnectionPoolNodeName()
+static OUString getConnectionPoolNodeName()
{
- static OUString s_sNodeName( "org.openoffice.Office.DataAccess/ConnectionPool" );
- return s_sNodeName;
+ return OUString( "org.openoffice.Office.DataAccess/ConnectionPool" );
}
-static const OUString& getEnablePoolingNodeName()
+static OUString getEnablePoolingNodeName()
{
- static OUString s_sNodeName( "EnablePooling" );
- return s_sNodeName;
+ return OUString( "EnablePooling" );
}
-static const OUString& getDriverNameNodeName()
+static OUString getDriverNameNodeName()
{
- static OUString s_sNodeName( "DriverName" );
- return s_sNodeName;
+ return OUString( "DriverName" );
}
-static const OUString& getDriverSettingsNodeName()
+static OUString getDriverSettingsNodeName()
{
- static OUString s_sNodeName( "DriverSettings" );
- return s_sNodeName;
+ return OUString( "DriverSettings" );
}
-static const OUString& getEnableNodeName()
+static OUString getEnableNodeName()
{
- static OUString s_sNodeName( "Enable" );
- return s_sNodeName;
+ return OUString( "Enable" );
}
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 79abed7..319bc68 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -435,7 +435,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
if ( bOk )
{
// HACK for access
- static const OUString s_sVarChar("VarChar");
+ static const char s_sVarChar[] = "VarChar";
do
{
sal_Int32 nPos = 1;
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index ee201ee..3174f78 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -142,11 +142,10 @@ static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell
CellContentType eCellType = xCell->getType();
if ( eCellType == CellContentType_FORMULA )
{
- static const OUString s_sFormulaResultType("FormulaResultType");
Reference<XPropertySet> xProp( xCell, UNO_QUERY );
try
{
- xProp->getPropertyValue( s_sFormulaResultType ) >>= eCellType; // type of formula result
+ xProp->getPropertyValue( "FormulaResultType" ) >>= eCellType; // type of formula result
}
catch (UnknownPropertyException&)
{
@@ -258,10 +257,9 @@ static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Refe
sal_Int16 nNumType = NumberFormat::NUMBER;
try
{
- static OUString s_NumberFormat("NumberFormat");
sal_Int32 nKey = 0;
- if ( xProp->getPropertyValue( s_NumberFormat ) >>= nKey )
+ if ( xProp->getPropertyValue( "NumberFormat" ) >>= nKey )
{
const Reference<XPropertySet> xFormat = xFormats->getByKey( nKey );
if ( xFormat.is() )
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index a754176..d353c36 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -374,9 +374,8 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, Run
::osl::MutexGuard aGuard( m_aMutex );
bool bReadOnly = false;
- static OUString sReadOnly( "IsReadOnly" );
::ucbhelper::Content aFile(m_pConnection->getContent(),Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext());
- aFile.getPropertyValue(sReadOnly) >>= bReadOnly;
+ aFile.getPropertyValue("IsReadOnly") >>= bReadOnly;
return bReadOnly;
}
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index eebe107..47d3472 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -622,7 +622,7 @@ OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName
OUString sName;
OUString sExt;
INetURLObject aURL;
- static const OUString s_sSeparator("/");
+ static const char s_sSeparator[] = "/";
xDir->beforeFirst();
while(xDir->next())
{
@@ -1149,7 +1149,7 @@ bool ODbaseTable::CreateImpl()
return true;
}
-void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName)
+void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId, const OUString& _sColumnName)
{
try
{
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 9a114fb..8e6a074 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -42,7 +42,7 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData()
void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
{
OSQLColumns::Vector::const_iterator aIter;
- static const OUString aName("Name");
+ static const char aName[] = "Name";
for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter)
{
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 5a766df..5ab8b44 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -167,7 +167,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
// check if any type is given
// when no types are given then we have to return all tables e.g. TABLE
- static const OUString aTable("TABLE");
+ static const char aTable[] = "TABLE";
bool bTableFound = true;
sal_Int32 nLength = types.getLength();
@@ -296,7 +296,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
}
if(bNewRow)
{
- aRow.push_back(new ORowSetValueDecorator(aTable));
+ aRow.push_back(new ORowSetValueDecorator(OUString(aTable)));
aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
aRows.push_back(aRow);
@@ -499,8 +499,7 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, Runt
OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( )
{
- static const OUString sQuote("\"");
- return sQuote;
+ return OUString("\"");
}
OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception)
@@ -853,8 +852,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL
OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception)
{
- static const OUString aValue( "sdbc:file:" );
- return aValue;
+ return OUString( "sdbc:file:" );
}
OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 0407c6d..5e672fd 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1034,7 +1034,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
uno::Reference< XResultSet > xResultSet = pResultSet;
uno::Reference< XStatement > statement = m_pConnection->createStatement();
- static const OUString wld("%");
+ static const char wld[] = "%";
OUStringBuffer queryBuf(
"SELECT "
"priv.RDB$RELATION_NAME, " // 1 Table name
@@ -1295,7 +1295,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
uno::Reference< XResultSet > xResultSet = pResultSet;
uno::Reference< XStatement > statement = m_pConnection->createStatement();
- static const OUString wld("%");
+ static const char wld[] = "%";
OUStringBuffer queryBuf(
"SELECT "
"RDB$RELATION_NAME, "
@@ -1662,7 +1662,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
// TODO: column specific privileges are included, we may need
// to have WHERE RDB$FIELD_NAME = NULL or similar.
- static const OUString wld("%");
+ static const char wld[] = "%";
OUStringBuffer queryBuf(
"SELECT "
"priv.RDB$RELATION_NAME, " // 1
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index b9e3efe..ce30f3b 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -332,14 +332,12 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,
if(io_nPrecisions)
{
io_nType = DataType::DECIMAL;
- static const OUString s_sDECIMAL("DECIMAL");
- o_sTypeName = s_sDECIMAL;
+ o_sTypeName = "DECIMAL";
}
else
{
io_nType = DataType::DOUBLE;
- static const OUString s_sDOUBLE("DOUBLE");
- o_sTypeName = s_sDOUBLE;
+ o_sTypeName = "DOUBLE";
}
}
else
@@ -356,33 +354,21 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,
{
case NUMBERFORMAT_DATE:
io_nType = DataType::DATE;
- {
- static const OUString s_sDATE("DATE");
- o_sTypeName = s_sDATE;
- }
+ o_sTypeName = "DATE";
break;
case NUMBERFORMAT_DATETIME:
io_nType = DataType::TIMESTAMP;
- {
- static const OUString s_sTIMESTAMP("TIMESTAMP");
- o_sTypeName = s_sTIMESTAMP;
- }
+ o_sTypeName = "TIMESTAMP";
break;
case NUMBERFORMAT_TIME:
io_nType = DataType::TIME;
- {
- static const OUString s_sTIME("TIME");
- o_sTypeName = s_sTIME;
- }
+ o_sTypeName = "TIME";
break;
default:
io_nType = DataType::VARCHAR;
io_nPrecisions = 0; // nyi: Data can be longer!
io_nScales = 0;
- {
- static const OUString s_sVARCHAR("VARCHAR");
- o_sTypeName = s_sVARCHAR;
- }
+ o_sTypeName = "VARCHAR";
};
nFlags |= ColumnSearch::CHAR;
}
@@ -477,7 +463,7 @@ OUString OFlatTable::getEntry()
INetURLObject aURL;
xDir->beforeFirst();
- static const OUString s_sSeparator("/");
+ static const char s_sSeparator[] = "/";
while(xDir->next())
{
sName = xRow->getString(1);
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 9a87f6e..975192d 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -53,8 +53,8 @@ void OHCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStrin
void OHCatalog::refreshTables()
{
TStringVector aVector;
- static const OUString s_sTableTypeView("VIEW");
- static const OUString s_sTableTypeTable("TABLE");
+ static const char s_sTableTypeView[] = "VIEW";
+ static const char s_sTableTypeTable[] = "TABLE";
Sequence< OUString > sTableTypes(2);
sTableTypes[0] = s_sTableTypeView;
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 6ee5c54..e1850b5 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -51,9 +51,9 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(m_xMetaData,_rName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
- static const OUString s_sTableTypeView("VIEW");
- static const OUString s_sTableTypeTable("TABLE");
- static const OUString s_sAll("%");
+ static const char s_sTableTypeView[] = "VIEW";
+ static const char s_sTableTypeTable[] = "TABLE";
+ static const char s_sAll[] = "%";
Sequence< OUString > sTableTypes(3);
sTableTypes[0] = s_sTableTypeView;
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 98a615f..124ab58 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -119,16 +119,16 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_In
if ( xRes.is() )
{
- static const OUString sSELECT( "SELECT" );
- static const OUString sINSERT( "INSERT" );
- static const OUString sUPDATE( "UPDATE" );
- static const OUString sDELETE( "DELETE" );
- static const OUString sREAD( "READ" );
- static const OUString sCREATE( "CREATE" );
- static const OUString sALTER( "ALTER" );
- static const OUString sREFERENCE( "REFERENCE" );
- static const OUString sDROP( "DROP" );
- static const OUString sYes( "YES" );
+ static const char sSELECT [] = "SELECT";
+ static const char sINSERT [] = "INSERT";
+ static const char sUPDATE [] = "UPDATE";
+ static const char sDELETE [] = "DELETE";
+ static const char sREAD [] = "READ";
+ static const char sCREATE [] = "CREATE";
+ static const char sALTER [] = "ALTER";
+ static const char sREFERENCE[] = "REFERENCE";
+ static const char sDROP [] = "DROP";
+ static const char sYes [] = "YES";
nRightsWithGrant = nRights = 0;
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 7baccaa..1bf1270 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -758,7 +758,7 @@ void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClas
OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const OUString& _sDriverClass)
{
- static const OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths");
+ static const char s_sNodeName[] = "org.openoffice.Office.DataAccess/JDBC/DriverClassPaths";
::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext(
m_pDriver->getContext(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
OUString sURL;
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index a50529c..c8bda37 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -51,9 +51,7 @@ KabDatabaseMetaData::~KabDatabaseMetaData()
const OUString & KabDatabaseMetaData::getAddressBookTableName()
{
- static const OUString aAddressBookTableName
- (OUString::createFromAscii( i18n("Address Book") ));
-
+ static const OUString aAddressBookTableName("Address Book");
return aAddressBookTableName;
}
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 70a760c..6402981 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -39,7 +39,7 @@ KabResultSetMetaData::~KabResultSetMetaData()
void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
{
OSQLColumns::Vector::const_iterator aIter;
- static const OUString aName("Name");
+ static const char aName[] = "Name";
for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter)
{
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index e0586ac..5eb0985 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -778,7 +778,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) throw(
Reference< XResultSet > xRef = pResult;
static ODatabaseMetaDataResultSet::ORows aRows;
- static const OUString aTable("TABLE");
+ static const char aTable[] = "TABLE";
if (aRows.empty())
{
@@ -963,7 +963,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
// check whether we have tables in the requested types
// for the moment, we answer only the "TABLE" table type
// when no types are given at all, we return all the tables
- static const OUString aTable("TABLE");
+ static const char aTable[] = "TABLE";
bool bTableFound = false;
const OUString* p = types.getConstArray(),
* pEnd = p + types.getLength();
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 24cd1de..6248ade 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -44,7 +44,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData()
void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
{
OSQLColumns::Vector::const_iterator aIter;
- static const OUString aName("Name");
+ static const char aName[] = "Name";
MacabRecords *aRecords;
MacabHeader *aHeader;
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 85adabe..cb071e0 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -54,9 +54,9 @@ void OMySQLCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TS
void OMySQLCatalog::refreshTables()
{
TStringVector aVector;
- static const OUString s_sTableTypeView("VIEW");
- static const OUString s_sTableTypeTable("TABLE");
- static const OUString s_sAll("%");
+ static const char s_sTableTypeView[] = "VIEW";
+ static const char s_sTableTypeTable[] = "TABLE";
+ static const char s_sAll[] = "%";
Sequence< OUString > sTableTypes(3);
sTableTypes[0] = s_sTableTypeView;
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index c76ade7..aa776a4 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -278,7 +278,7 @@ namespace connectivity
OUString sAdd;
if ( RTL_TEXTENCODING_UTF8 == (*aLookup).getEncoding() )
{
- static const OUString s_sCharSetOp("useUnicode=true&");
+ static const char s_sCharSetOp[] = "useUnicode=true&";
if ( !sCuttedUrl.matchIgnoreAsciiCase(s_sCharSetOp) )
{
sAdd = s_sCharSetOp;
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 37a3ce4..8fc1463 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list