[Libreoffice-commits] .: 2 commits - chart2/source cui/source dbaccess/source sd/source shell/source svtools/source svx/source writerfilter/source
Takeshi Abe
tabe at kemper.freedesktop.org
Wed May 16 07:31:02 PDT 2012
chart2/source/tools/Scaling.cxx | 8 --------
chart2/source/view/axes/DateScaling.cxx | 5 -----
cui/source/customize/cfg.cxx | 1 -
cui/source/dialogs/cuigaldlg.cxx | 3 ---
cui/source/dialogs/scriptdlg.cxx | 1 -
cui/source/options/optgdlg.cxx | 3 ---
dbaccess/source/core/api/OptimisticSet.cxx | 12 ------------
dbaccess/source/ui/dlg/queryorder.cxx | 1 -
dbaccess/source/ui/misc/UITools.cxx | 1 -
sd/source/core/stlfamily.cxx | 6 ------
sd/source/filter/eppt/epptso.cxx | 2 --
sd/source/ui/view/drviewsa.cxx | 4 ----
shell/source/win32/simplemail/smplmailclient.cxx | 1 -
svtools/source/uno/statusbarcontroller.cxx | 6 ------
svx/source/customshapes/EnhancedCustomShape3d.cxx | 3 ---
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2 --
16 files changed, 59 deletions(-)
New commits:
commit b2022330c01ae2080f4c2bc01be430b0b6faf9d8
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed May 16 23:27:08 2012 +0900
removed unused constant rtl::OUString
Change-Id: I173275e0f8faa852500d108f65636080f79636c6
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 38d25d5..e62b25d 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -42,14 +42,6 @@ static const ::rtl::OUString lcl_aServiceName_Linear(
static const ::rtl::OUString lcl_aServiceName_Power(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PowerScaling" ));
-static const ::rtl::OUString lcl_aImplementationName_Logarithmic(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.LogarithmicScaling" ));
-static const ::rtl::OUString lcl_aImplementationName_Exponential(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ExponentialScaling" ));
-static const ::rtl::OUString lcl_aImplementationName_Linear(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.LinearScaling" ));
-static const ::rtl::OUString lcl_aImplementationName_Power(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.PowerScaling" ));
}
//.............................................................................
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index cb532ab..66e6c2e 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -39,11 +39,6 @@ static const ::rtl::OUString lcl_aServiceName_DateScaling(
static const ::rtl::OUString lcl_aServiceName_InverseDateScaling(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.InverseDateScaling" ));
-static const ::rtl::OUString lcl_aImplementationName_DateScaling(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DateScaling" ));
-static const ::rtl::OUString lcl_aImplementationName_InverseDateScaling(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.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
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5624c73..4c5fa1c 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -458,7 +458,6 @@ OUString GetUIModuleName( const OUString& aModuleId, const uno::Reference< css::
if ( a >>= aSeq )
{
- OUString aUIName;
for ( sal_Int32 i = 0; i < aSeq.getLength(); ++i )
{
if ( aSeq[i].Name == "ooSetupFactoryUIName" )
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 9c14228..db1369d 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -923,9 +923,6 @@ void TPGalleryThemeProperties::FillFilterList()
// media filters
static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
::avmedia::FilterNameVector aFilters;
- const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
- ::rtl::OUString aAllTypes;
-
::avmedia::MediaWindow::getMediaFilters( aFilters );
for( unsigned long l = 0; l < aFilters.size(); ++l )
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 616ee0f..8dc87a9 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1486,7 +1486,6 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
::rtl::OUString GetErrorMessage( const com::sun::star::uno::Any& aException )
{
- ::rtl::OUString exType;
if ( aException.getValueType() ==
::getCppuType( (const reflection::InvocationTargetException* ) NULL ) )
{
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 460f08a..762ec3d 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1285,9 +1285,6 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
aUserInterfaceLB.SelectEntryPos(0);
try
{
- OUString sOfficeLocaleValue;
- OUString sSystemLocaleValue;
-
Reference< XMultiServiceFactory > theConfigProvider(
com::sun::star::configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext()));
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 94a568c..8d408f6 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -189,9 +189,6 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
// list all cloumns that should be set
static ::rtl::OUString s_sPara(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
- ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
::rtl::OUString aColumnName;
::rtl::OUStringBuffer sKeyCondition;
@@ -274,9 +271,6 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
TSQLStatements aKeyConditions;
::std::map< ::rtl::OUString,bool > aResultSetChanged;
::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
- ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
// here we build the condition part for the update statement
SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
@@ -379,9 +373,6 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
{
- ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
- ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
- static const ::rtl::OUString s_sAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
::rtl::OUString aQuote = getIdentifierQuoteString();
::rtl::OUString aColumnName;
::rtl::OUStringBuffer sKeyCondition,sIndexCondition;
@@ -649,9 +640,6 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
TSQLStatements aKeyConditions;
::std::map< ::rtl::OUString,bool > aResultSetChanged;
::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
- ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
// here we build the condition part for the update statement
SelectColumnsMetaData::const_iterator aColIter = m_pColumnNames->begin();
SelectColumnsMetaData::const_iterator aColEnd = m_pColumnNames->end();
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index f0b8a79..0f8a89c 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -270,7 +270,6 @@ void DlgOrderCrit::EnableLines()
::rtl::OUString sRealName;
xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
sName = sRealName;
- static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction"));
static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function"));
if ( xColumn->getPropertySetInfo()->hasPropertyByName(sFunction) )
xColumn->getPropertyValue(sFunction) >>= bFunction;
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 3474768..5e60e7c 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1066,7 +1066,6 @@ sal_Bool appendToFilter(const Reference<XConnection>& _xConnection,
xProp->getPropertyValue(PROPERTY_TABLEFILTER) >>= aFilter;
// first check if we have something like SCHEMA.%
sal_Bool bHasToInsert = sal_True;
- static ::rtl::OUString sPattern(RTL_CONSTASCII_USTRINGPARAM("%"));
const ::rtl::OUString* pBegin = aFilter.getConstArray();
const ::rtl::OUString* pEnd = pBegin + aFilter.getLength();
for (;pBegin != pEnd; ++pBegin)
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index ec45ac5..7b32a4b 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -264,7 +264,6 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce
OUString* pNames = aNames.getArray();
while( iter != rStyleMap.end() )
{
- const OUString sName( (*iter).first );
rtl::Reference< SdStyleSheet > xStyle( (*iter++).second );
if( xStyle.is() )
{
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 3547dea..36dda36 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3717,8 +3717,6 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
static const rtl::OUString sBottomBorder( "BottomBorder" );
static const rtl::OUString sLeftBorder( "LeftBorder" );
static const rtl::OUString sRightBorder( "RightBorder" );
- static const rtl::OUString sDiagonalTLBR( "DiagonalTLBR" );
- static const rtl::OUString sDiagonalBLTR( "DiagonalBLTR" );
// creating horz lines
sal_Int32 nYPos = MapPoint( rXShape->getPosition() ).Y;
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 1dabda6..56ee97a 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -82,10 +82,6 @@ using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace {
-static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME("masterviewtoolbar");
-}
-
namespace sd {
sal_Bool DrawViewShell::mbPipette = sal_False;
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index a6e0187..14cac42 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -66,7 +66,6 @@ const rtl::OUString CC(RTL_CONSTASCII_USTRINGPARAM("--cc"));
const rtl::OUString BCC(RTL_CONSTASCII_USTRINGPARAM("--bcc"));
const rtl::OUString FROM(RTL_CONSTASCII_USTRINGPARAM("--from"));
const rtl::OUString SUBJECT(RTL_CONSTASCII_USTRINGPARAM("--subject"));
-const rtl::OUString BODY(RTL_CONSTASCII_USTRINGPARAM("--body"));
const rtl::OUString ATTACH(RTL_CONSTASCII_USTRINGPARAM("--attach"));
const rtl::OUString FLAG_MAPI_DIALOG(RTL_CONSTASCII_USTRINGPARAM("--mapi-dialog"));
const rtl::OUString FLAG_MAPI_LOGON_UI(RTL_CONSTASCII_USTRINGPARAM("--mapi-logon-ui"));
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 2cb1d9c..34f72eb 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.cxx
@@ -133,12 +133,6 @@ void SAL_CALL StatusbarController::release() throw ()
void SAL_CALL StatusbarController::initialize( const Sequence< Any >& aArguments )
throw ( Exception, 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" ));
- const rtl::OUString aParentWindow( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ));
- const rtl::OUString aIdentifier( RTL_CONSTASCII_USTRINGPARAM( "Identifier" ));
-
bool bInitialized( true );
{
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index a6eca2e..3378a1b 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -298,7 +298,6 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
pMap = &fMap;
}
}
- const rtl::OUString sExtrusion(aExtrusion);
if ( GetBool( rGeometryItem, aExtrusion, sal_False ) )
{
sal_Bool bIsMirroredX = ((SdrObjCustomShape*)pCustomShape)->IsMirroredX();
@@ -648,8 +647,6 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
pScene->GetProperties().SetObjectItem( Svx3DLightDirection3Item( aSpotLight3 ) );
const rtl::OUString sSpecularity( RTL_CONSTASCII_USTRINGPARAM ( "Specularity" ) );
- const rtl::OUString sDiffusion( RTL_CONSTASCII_USTRINGPARAM ( "Diffusion" ) );
- const rtl::OUString sShininess( RTL_CONSTASCII_USTRINGPARAM ( "Shininess" ) );
const rtl::OUString sMetal( RTL_CONSTASCII_USTRINGPARAM ( "Metal" ) );
double fSpecular = GetDouble( rGeometryItem, sSpecularity, 0, NULL ) / 100;
sal_Bool bMetal = GetBool( rGeometryItem, sMetal, sal_False );
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index f0e21c2..58d7627 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -47,8 +47,6 @@
#include "Handler.hxx"
#include "ooxmlLoggers.hxx"
-static const ::rtl::OUString aEmptyStr;
-
static const sal_uInt8 s0x7[] = { 0x7, 0x0 };
static const sal_uInt8 s0xd[] = { 0xd, 0x0 };
static const sal_uInt8 sCR[] = { 0xd, 0x0 };
commit 2dd60383c119d80eff7188ddf003ce9d27ef7519
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed May 16 21:06:38 2012 +0900
removed useless code
Change-Id: If60124deaeb5b756c17c9f724ec150e909cc7373
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index f3dcfaf..ec45ac5 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -270,11 +270,6 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce
{
*pNames++ = xStyle->GetApiName();
}
- else
- {
- int i = 0;
- i++;
- }
}
return aNames;
More information about the Libreoffice-commits
mailing list