connectivity/source/drivers/dbase/DTable.cxx | 1 -
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 6
------
desktop/source/migration/services/oo3extensionmigration.cxx | 7
-------
desktop/source/migration/services/wordbookmigration.cxx | 2 --
filter/source/msfilter/escherex.cxx | 2 --
framework/source/services/frame.cxx | 2 --
framework/source/uielement/buttontoolbarcontroller.cxx | 4 ----
framework/source/uielement/fontsizemenucontroller.cxx | 1 -
oox/source/helper/propertymap.cxx | 1 -
oox/source/ole/axcontrol.cxx | 1 -
reportdesign/source/filter/xml/xmlExport.cxx | 1 -
sc/source/ui/vba/vbachart.cxx | 1 -
sc/source/ui/vba/vbachartobject.cxx | 1 -
sc/source/ui/vba/vbarange.cxx | 3 ---
sw/source/ui/envelp/mailmrge.cxx | 2 --
ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx | 5 -----
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 2 --
xmloff/source/chart/PropertyMaps.cxx | 1 -
xmloff/source/draw/layerimp.cxx | 2 --
19 files changed, 45 deletions(-)
New commits:
commit a6b68f4682c16281249889016921a289411da753
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Mon May 14 23:43:05 2012 +0900
removed unused static rtl::OUString
Change-Id: I5a097beaaeb30214ed6071bba1297e551291922b
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index 63f792e..3213aee 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -329,7 +329,6 @@ void ODbaseTable::fillColumns()
String aStrFieldName;
aStrFieldName.AssignAscii("Column");
::rtl::OUString aTypeName;
- static const ::rtl::OUString
sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
const sal_Bool bCase =
getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
const bool bFoxPro = m_aHeader.db_typ == VisualFoxPro || m_aHeader.db_typ
== VisualFoxProAuto || m_aHeader.db_typ == FoxProMemo;
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 9a4b211..49eec24 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -87,12 +87,6 @@
static NS_DEFINE_CID(kCharsetConverterManagerCID,
NS_ICHARSETCONVERTERMANAGER_CID);
#endif
-// Registry Keys
-
-static ::rtl::OUString szProfileSubtreeString( RTL_CONSTASCII_USTRINGPARAM(
"Profiles" ));
-static ::rtl::OUString szCurrentProfileString( RTL_CONSTASCII_USTRINGPARAM(
"CurrentProfile" ));
-static ::rtl::OUString szDirectoryString( RTL_CONSTASCII_USTRINGPARAM(
"directory" ));
-
#ifndef MAXPATHLEN
#define MAXPATHLEN 1024
#endif
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx
b/desktop/source/migration/services/oo3extensionmigration.cxx
index af86e84..12f4ec4 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -57,16 +57,9 @@ namespace migration
static ::rtl::OUString sExtensionSubDir = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/user/uno_packages/" ) );
static ::rtl::OUString sSubDirName = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "cache" ) );
-static ::rtl::OUString sConfigDir = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/user/registry/data" ) );
-static ::rtl::OUString sOrgDir = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"/user/registry/data/org" ) );
-static ::rtl::OUString sExcludeDir1 = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/user/registry/data/org" ) );
-static ::rtl::OUString sExcludeDir2 = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/user/registry/data/org/openoffice" ) );
static ::rtl::OUString sDescriptionXmlFile = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/description.xml" ) );
static ::rtl::OUString sExtensionRootSubDirName = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/uno_packages" ) );
-static ::rtl::OUString sConfigurationDataType = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.configuration-data"));
-static ::rtl::OUString sConfigurationSchemaType = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.configuration-schema"));
-
//
=============================================================================
// component operations
//
=============================================================================
diff --git a/desktop/source/migration/services/wordbookmigration.cxx
b/desktop/source/migration/services/wordbookmigration.cxx
index 2d274d1..d8c320d 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -43,8 +43,6 @@ namespace migration
static ::rtl::OUString sSourceSubDir = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/user/wordbook" ) );
static ::rtl::OUString sTargetSubDir = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/user/wordbook" ) );
- static ::rtl::OUString sBaseName = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "/wordbook" ) );
- static ::rtl::OUString sSuffix = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ".dic" ) );
//
=============================================================================
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 56a7c26..a324987 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3037,8 +3037,6 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
sal_uInt16 nElements =
(sal_uInt16)aHandlesPropSeq.getLength();
if ( nElements )
{
- const rtl::OUString sHandle (
RTL_CONSTASCII_USTRINGPARAM( "Handle" ) );
-
sal_uInt16 k, j, nElementSize = 36;
sal_uInt32 nStreamSize = nElementSize *
nElements + 6;
SvMemoryStream aOut( nStreamSize );
diff --git a/framework/source/services/frame.cxx
b/framework/source/services/frame.cxx
index 7db9117..87eabe2 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2583,8 +2583,6 @@ void SAL_CALL Frame::impl_setPropertyValue(const
::rtl::OUString& /*sProperty*/,
const css::uno::Any& aValue )
{
- static ::rtl::OUString
MATERIALPROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title"));
-
/* There is no need to lock any mutex here. Because we share the
solar mutex with our base class. And we said to our base class: "dont
release it on calling us" .-)
see ctor of PropertySetHelper for further informations.
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx
b/framework/source/uielement/buttontoolbarcontroller.cxx
index 42c13b0..5840780 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -123,10 +123,6 @@ void SAL_CALL ButtonToolbarController::initialize(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
aArguments )
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException)
{
- const rtl::OUString aFrameName( RTL_CONSTASCII_USTRINGPARAM( "Frame" ));
- const rtl::OUString aCommandURLName( RTL_CONSTASCII_USTRINGPARAM(
"CommandURL" ));
- const rtl::OUString aServiceManagerName( RTL_CONSTASCII_USTRINGPARAM(
"ServiceManager" ));
-
bool bInitialized( true );
{
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx
b/framework/source/uielement/fontsizemenucontroller.cxx
index dc60f11..c71ace3 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -148,7 +148,6 @@ void FontSizeMenuController::setCurHeight( long nHeight,
Reference< css::awt::XP
// private function
void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >&
rPopupMenu )
{
- const rtl::OUString aFontNameCommand( RTL_CONSTASCII_USTRINGPARAM(
".uno:FontHeight?FontHeight=" ));
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu
*)VCLXMenu::GetImplementation( rPopupMenu );
PopupMenu* pVCLPopupMenu = 0;
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index 99ca67a..513dfdb 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -537,7 +537,6 @@ static void printParameterPairData(int level,
EnhancedCustomShapeParameterPair &
static const char* lclDumpAnyValueCode( Any value, int level = 0)
{
- static OUString sVoid = CREATE_OUSTRING("void");
OUString strValue;
Sequence< OUString > strArray;
Sequence< Any > anyArray;
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 81a1f0e..eb5a205 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2507,7 +2507,6 @@ HtmlSelectModel::HtmlSelectModel()
bool
HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm )
{
- static OUString sTerm( RTL_CONSTASCII_USTRINGPARAM("</SELECT") );
static String sMultiple( RTL_CONSTASCII_USTRINGPARAM("<SELECT MULTIPLE") );
static String sSelected( RTL_CONSTASCII_USTRINGPARAM("OPTION SELECTED") );
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 686ab66..ee2ebc1 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1433,7 +1433,6 @@ void ORptExport::exportParagraph(const Reference<
XReportControlModel >& _xRepor
static const ::rtl::OUString
s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
static const ::rtl::OUString
s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
static const ::rtl::OUString
s_sReportPrefix(RTL_CONSTASCII_USTRINGPARAM("rpt:"));
- static const ::rtl::OUString
s_sConcatOperator(RTL_CONSTASCII_USTRINGPARAM("&"));
sFieldData =
sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() -
s_sReportPrefix.getLength());
sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber);
if ( nPageNumberIndex != -1 )
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 7c0c933..6c7bbdf 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -73,7 +73,6 @@ const rtl::OUString STACKED(
RTL_CONSTASCII_USTRINGPARAM("Stacked") );
const rtl::OUString DIM3D( RTL_CONSTASCII_USTRINGPARAM("Dim3D") );
const rtl::OUString HASMAINTITLE( RTL_CONSTASCII_USTRINGPARAM("HasMainTitle")
);
const rtl::OUString HASLEGEND( RTL_CONSTASCII_USTRINGPARAM("HasLegend") );
-const rtl::OUString DATACAPTION( RTL_CONSTASCII_USTRINGPARAM("DataCaption") );
ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >&
_xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext,
const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const
css::uno::Reference< css::table::XTableChart >& _xTableChart ) :
ChartImpl_BASE( _xParent, _xContext ), mxTableChart( _xTableChart )
{
diff --git a/sc/source/ui/vba/vbachartobject.cxx
b/sc/source/ui/vba/vbachartobject.cxx
index da5086d..0910ad2 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -37,7 +37,6 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-const rtl::OUString CHART_NAME( RTL_CONSTASCII_USTRINGPARAM("Name") );
const rtl::OUString PERSIST_NAME( RTL_CONSTASCII_USTRINGPARAM("PersistName") );
ScVbaChartObject::ScVbaChartObject( const css::uno::Reference<
ov::XHelperInterface >& _xParent, const css::uno::Reference<
css::uno::XComponentContext >& _xContext, const css::uno::Reference<
css::table::XTableChart >& _xTableChart, const css::uno::Reference<
css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE(
_xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier(
_xDrawPageSupplier )
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index def7b63..99a2308 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -669,8 +669,6 @@ public:
const static ::rtl::OUString ISVISIBLE( RTL_CONSTASCII_USTRINGPARAM(
"IsVisible"));
-const static ::rtl::OUString WIDTH( RTL_CONSTASCII_USTRINGPARAM( "Width"));
-const static ::rtl::OUString HEIGHT( RTL_CONSTASCII_USTRINGPARAM( "Height"));
const static ::rtl::OUString POSITION( RTL_CONSTASCII_USTRINGPARAM(
"Position"));
const static rtl::OUString EQUALS( RTL_CONSTASCII_USTRINGPARAM("=") );
const static rtl::OUString NOTEQUALS( RTL_CONSTASCII_USTRINGPARAM("<>") );
@@ -682,7 +680,6 @@ const static rtl::OUString CONTS_HEADER(
RTL_CONSTASCII_USTRINGPARAM("ContainsHe
const static rtl::OUString INSERTPAGEBREAKS(
RTL_CONSTASCII_USTRINGPARAM("InsertPageBreaks" ));
const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY(
RTL_CONSTASCII_USTRINGPARAM("The command you chose cannot be performed with
multiple selections.\nSelect a single range and click the command again") );
const static rtl::OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND(
RTL_CONSTASCII_USTRINGPARAM("No cells were found") );
-const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOROWCOLUMNSONLY(
RTL_CONSTASCII_USTRINGPARAM("Property only applicable for Columns and Rows") );
const static rtl::OUString CELLSTYLE( RTL_CONSTASCII_USTRINGPARAM("CellStyle")
);
class CellValueSetter : public ValueSetter
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 69bd922..14cc5b2 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -431,8 +431,6 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell&
rShell,
sCommand += C2U(":default_first");
uno::Reference< container::XEnumeration > xList =
xQuery->createSubSetEnumerationByQuery(sCommand);
const ::rtl::OUString sName(RTL_CONSTASCII_USTRINGPARAM("Name"));
- const ::rtl::OUString sFlags(RTL_CONSTASCII_USTRINGPARAM("Flags"));
- const ::rtl::OUString sUIName(RTL_CONSTASCII_USTRINGPARAM("UIName"));
sal_uInt16 nODT = USHRT_MAX;
while(xList->hasMoreElements())
{
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index b17433f..51824af 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -367,11 +367,6 @@ HierarchyResultSetDataSupplier::queryPropertyValues(
sal_uInt32 nIndex )
if ( getResult( nIndex ) )
{
- static rtl::OUString aFolderType(
- RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ) );
- static rtl::OUString aLinkType(
- RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE ) );
-
HierarchyContentProperties aData(
m_pImpl->m_aResults[ nIndex ]->aData );
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 4c15671..e3f3a81 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -317,8 +317,6 @@ VbaApplicationBase::getVersion() throw
(uno::RuntimeException)
uno::Any SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName,
const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const
uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any&
varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10,
const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const
uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const
uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const
uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const
uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const
uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const
uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException)
{
- ::rtl::OUString sSeparator(RTL_CONSTASCII_USTRINGPARAM("/"));
- ::rtl::OUString sMacroSeparator(RTL_CONSTASCII_USTRINGPARAM("!"));
::rtl::OUString aMacroName = MacroName.trim();
if (0 == aMacroName.indexOf('!'))
aMacroName = aMacroName.copy(1).trim();
diff --git a/xmloff/source/chart/PropertyMaps.cxx
b/xmloff/source/chart/PropertyMaps.cxx
index 0856f0c..96c148f 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -503,7 +503,6 @@ bool XMLChartImportPropertyMapper::handleSpecialItem(
const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap ) const
{
- static const ::rtl::OUString sPackageProtocol(
RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
sal_Int32 nContextId = maPropMapper->GetEntryContextId( rProperty.mnIndex
);
sal_Bool bRet = (nContextId != 0);
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 1ab2901..c101642 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -78,8 +78,6 @@ SdXMLLayerContext::SdXMLLayerContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
: SvXMLImportContext(rImport, nPrefix, rLocalName)
, mxLayerManager( xLayerManager )
{
- const OUString strName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) );
-
OUString aName;
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
