[Libreoffice-commits] core.git: sc/source sd/source svtools/source svx/source ucb/source unotools/source vcl/source xmlhelp/source xmlscript/source
Thomas Arnhold
thomas at arnhold.org
Sun Feb 24 20:43:48 PST 2013
sc/source/core/data/dpgroup.cxx | 2 --
sc/source/core/tool/dbdata.cxx | 1 -
sc/source/filter/oox/condformatbuffer.cxx | 2 +-
sc/source/ui/condformat/condformatdlgentry.cxx | 1 -
sc/source/ui/docshell/docsh.cxx | 1 -
sc/source/ui/navipi/content.cxx | 1 -
sc/source/ui/unoobj/shapeuno.cxx | 1 -
sd/source/ui/func/fusel.cxx | 6 +-----
sd/source/ui/slideshow/slideshowimpl.cxx | 6 ++----
sd/source/ui/unoidl/unoobj.cxx | 3 +--
svtools/source/config/extcolorcfg.cxx | 1 -
svtools/source/contnr/imivctl1.cxx | 1 -
svtools/source/contnr/svimpbox.cxx | 1 -
svtools/source/control/ruler.cxx | 2 --
svtools/source/misc/transfer.cxx | 2 --
svtools/source/toolpanel/paneltabbar.cxx | 2 --
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 --
ucb/source/ucp/cmis/cmis_url.cxx | 3 ---
ucb/source/ucp/file/shell.cxx | 3 ---
ucb/source/ucp/ftp/ftpurl.cxx | 1 -
ucb/source/ucp/gvfs/gvfs_content.cxx | 6 ------
ucb/source/ucp/package/pkgcontent.cxx | 1 -
ucb/source/ucp/tdoc/tdoc_content.cxx | 2 --
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 3 ---
unotools/source/config/dynamicmenuoptions.cxx | 7 -------
vcl/source/control/button.cxx | 1 -
vcl/source/edit/texteng.cxx | 2 +-
vcl/source/gdi/image.cxx | 1 -
vcl/source/window/builder.cxx | 4 +---
xmlhelp/source/cxxhelp/provider/provider.cxx | 5 -----
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 1 -
31 files changed, 7 insertions(+), 68 deletions(-)
New commits:
commit 76b3e61bb4ac66decd7800ef309f3241e77d538f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 25 05:41:44 2013 +0100
loplugin: unused variables
Change-Id: I07b82471f0f32e9e894d4eb392beedeafc6be0c7
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 483677b..a7a216b 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -845,8 +845,6 @@ void ScDPGroupTableData::FillGroupValues(vector<SCROW>& rItems, const vector<lon
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_Int32 nPartValue = ScDPUtil::getDatePartValue(
pData->GetValue(), *pNumInfo, nDatePart, pFormatter);
- rtl::OUString aName = ScDPUtil::getDateGroupName(
- nDatePart, nPartValue, pFormatter, pNumInfo->mfStart, pNumInfo->mfEnd);
ScDPItemData aItem(nDatePart, nPartValue);
rItems[i] = pCache->GetIdByItemData(nColumn, aItem);
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index ca3d5e2..6b773c3 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -784,7 +784,6 @@ ScDBData* ScDBCollection::AnonDBs::getByRange(const ScRange& rRange)
void ScDBCollection::AnonDBs::insert(ScDBData* p)
{
- rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(STR_DB_GLOBAL_NONAME));
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<ScDBData> pNew(p);
SAL_WNODEPRECATED_DECLARATIONS_POP
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 0fd094e..aec2f5d 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -726,7 +726,7 @@ void CondFormatRule::finalizeImport()
if( !aReplaceFormula.isEmpty() )
{
- OUString aAddress, aRanges, aText, aComp;
+ OUString aAddress;
sal_Int32 nStrPos = aReplaceFormula.getLength();
while( (nStrPos = aReplaceFormula.lastIndexOf( '#', nStrPos )) >= 0 )
{
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 40d247e..b6338de 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -449,7 +449,6 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre
pDisp->Lock(sal_True);
// Find the new style and add it into the style list boxes
- rtl::OUString aNewStyle;
SfxStyleSheetIterator aStyleIter( pDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA );
bool bFound = false;
for ( SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle && !bFound; pStyle = aStyleIter.Next() )
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 24e4c82..0c585a9 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -424,7 +424,6 @@ sal_Bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::un
//did not use cached formula results.
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(GetModel(), uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentProperties> xDocProps = xDPS->getDocumentProperties();
- rtl::OUString sGenerator = xDocProps->getGenerator();
Reference<uno::XComponentContext> xContext = comphelper::getProcessComponentContext();
ScRecalcOptions nRecalcMode =
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 30053a3..4653c35 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -370,7 +370,6 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
if( (nType != SC_CONTENT_ROOT) && (nChild == SC_CONTENT_NOCHILD) )
{
- String aText( GetEntryText( pEntry ) );
if ( IsExpanded( pEntry ) )
Collapse( pEntry );
else
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 6d6f334..21aced6 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -290,7 +290,6 @@ static ScRange lcl_GetAnchorCell( uno::Reference< drawing::XShape >& xShape, ScD
{
ScRange aReturn;
rUnoPoint = xShape->getPosition();
- rtl::OUString sType(xShape->getShapeType());
sal_Bool bCaptionShape(lcl_GetCaptionPoint(xShape, rCaptionPoint));
if (pDoc->IsNegativePage(nTab))
{
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 196a3cc..4cca3a9 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1404,15 +1404,11 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
// aMacro has got following format:
// "Macroname.Modulname.Libname.Documentname" or
- // "Macroname.Modulname.Libname.Applicationsname"
+ // "Macroname.Modulname.Libname.Applicationname"
String aMacroName =
aMacro.GetToken(0, sal_Unicode('.'));
String aModulName =
aMacro.GetToken(1, sal_Unicode('.'));
- String aLibName =
- aMacro.GetToken(2, sal_Unicode('.'));
- String aDocName =
- aMacro.GetToken(3, sal_Unicode('.'));
// In this moment the Call-method only
// resolves modulename+macroname
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index d317fca..8d35441 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1630,12 +1630,10 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
else
{
// aMacro has the following syntax:
- // "Macroname.Modulname.Libname.Dokumentname" or
- // "Macroname.Modulname.Libname.Applikationsname"
+ // "Macroname.Modulname.Libname.Documentname" or
+ // "Macroname.Modulname.Libname.Applicationname"
String aMacroName = aMacro.GetToken(0, sal_Unicode('.'));
String aModulName = aMacro.GetToken(1, sal_Unicode('.'));
- String aLibName = aMacro.GetToken(2, sal_Unicode('.'));
- String aDocName = aMacro.GetToken(3, sal_Unicode('.'));
// todo: is the limitation still given that only
// Modulname+Macroname can be used here?
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 83dc942..d46264d 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1546,11 +1546,10 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
// aMacro has got following format:
// "Macroname.Modulname.Libname.Documentname" or
- // "Macroname.Modulname.Libname.Applicationsname"
+ // "Macroname.Modulname.Libname.Applicationname"
String aMacroName = aMacro.GetToken(0, sal_Unicode('.'));
String aModulName = aMacro.GetToken(1, sal_Unicode('.'));
String aLibName = aMacro.GetToken(2, sal_Unicode('.'));
- String aDocName = aMacro.GetToken(3, sal_Unicode('.'));
OUStringBuffer sBuffer;
sBuffer.append( aLibName );
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 98d361d..9235317 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -418,7 +418,6 @@ void ExtendedColorConfig_Impl::Commit()
return;
const ::rtl::OUString sColorEntries(RTL_CONSTASCII_USTRINGPARAM("Entries"));
const ::rtl::OUString sColor(RTL_CONSTASCII_USTRINGPARAM("/Color"));
- const ::rtl::OUString sDefaultColor(RTL_CONSTASCII_USTRINGPARAM("/DefaultColor"));
::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/"));
const ::rtl::OUString s_sSep(RTL_CONSTASCII_USTRINGPARAM("/"));
sBase += m_sLoadedScheme;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 6dcc15a..b84ab9ed 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2654,7 +2654,6 @@ void SvxIconChoiceCtrl_Impl::SetDefaultTextSize()
if( nDX <= 0 )
nDX = 2;
- String aStrDummy( RTL_CONSTASCII_USTRINGPARAM( "X" ) );
long nHeight = pView->GetTextHeight();
if( nDY < nHeight )
nDY = nHeight;
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 4888fbd..1c37d6d 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -951,7 +951,6 @@ void SvImpLBox::Paint( const Rectangle& rRect )
nFlags &= (~F_DESEL_ALL);
pView->SetClipRegion();
- Rectangle aRect;
if( !(nFlags & F_PAINTED) )
{
nFlags |= F_PAINTED;
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 99a8697..fcc2037 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -711,8 +711,6 @@ void Ruler::ImplDrawBorders( long nMin, long nMax, long nVirTop, long nVirBottom
void Ruler::ImplDrawIndent( const Polygon& rPoly, sal_uInt16 nStyle )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- Point aPos1;
- Point aPos2;
if ( nStyle & RULER_STYLE_INVISIBLE )
return;
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 97988ce..55e72da 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1398,8 +1398,6 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
// add, if it is a UTF-8 byte buffer
if( xMimeType->hasParameter( aCharsetStr ) )
{
- const ::rtl::OUString aCharset( xMimeType->getParameterValue( aCharsetStr ) );
-
if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) ||
xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) )
{
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 1c08d59..f7922a3 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -554,8 +554,6 @@ namespace svt
ItemDescriptor aItem;
aItem.pPanel = pPanel;
- Rectangle aContentArea;
-
const Size aCompleteSize( impl_calculateItemContentSize( pPanel, TABITEM_IMAGE_AND_TEXT ) );
const Size aIconOnlySize( impl_calculateItemContentSize( pPanel, TABITEM_IMAGE_ONLY ) );
const Size aTextOnlySize( impl_calculateItemContentSize( pPanel, TABITEM_TEXT_ONLY ) );
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index a5f0703..33354e7 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -294,8 +294,6 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
Rectangle aFocusRect( mpRepr->CalculateFocusRectangle( p->ePoint ) );
- Rectangle aBoundingBoxOnScreen( mpRepr->OutputToScreenPixel( aFocusRect.TopLeft() ), aFocusRect.GetSize() );
-
SvxRectCtlChildAccessibleContext* pChild = new SvxRectCtlChildAccessibleContext(
this, *mpRepr, aName, aDescr, aFocusRect, nIndex );
xChild = mpChildren[ nIndex ] = pChild;
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index dc23c9e..db7f613 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -41,9 +41,6 @@ namespace cmis
{
URL::URL( rtl::OUString const & urlStr )
{
- rtl::OUString sBindingUrl;
- rtl::OUString sRepositoryId;
-
INetURLObject aUrl( urlStr );
// Decode the authority to get the binding URL and repository id
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 6afb2d4..8054bba 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1272,10 +1272,7 @@ shell::move( sal_Int32 CommandId,
copyPersistentSet( srcUnqPath,dstUnqPath,!isDocument );
rtl::OUString aDstParent = getParentName( dstUnqPath );
- rtl::OUString aDstTitle = getTitle( dstUnqPath );
-
rtl::OUString aSrcParent = getParentName( srcUnqPath );
- rtl::OUString aSrcTitle = getTitle( srcUnqPath );
notifyInsert( getContentEventListeners( aDstParent ),dstUnqPath );
if( aDstParent != aSrcParent )
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index b3002fa..b832b69 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -441,7 +441,6 @@ std::vector<FTPDirentry> FTPURL::list(
sal_uInt32 len = data.m_nWritePos;
char* fwd = (char*) data.m_pBuffer;
- rtl::OString str(fwd,len);
char *p1, *p2;
p1 = p2 = fwd;
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 7d29e0f..27732f2 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -326,12 +326,6 @@ uno::Any SAL_CALL Content::execute(
aRet <<= getCommandInfo( xEnv, sal_False );
} else if ( COMMAND_IS( aCommand, "open" ) ) {
- rtl::OUString str = m_xIdentifier->getContentIdentifier();
- rtl::OString stra(
- str.getStr(),
- str.getLength(),
- RTL_TEXTENCODING_UTF8);
-
ucb::OpenCommandArgument2 aOpenCommand;
if ( !( aCommand.Argument >>= aOpenCommand ) )
ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 389f67c..40f345a 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -1484,7 +1484,6 @@ uno::Any Content::open(
// Unreachable
}
- rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
uno::Reference< io::XOutputStream > xOut( rArg.Sink, uno::UNO_QUERY );
if ( xOut.is() )
{
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index c067b62..179d3db 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1442,8 +1442,6 @@ uno::Any Content::open(
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
-
uno::Reference< io::XActiveDataStreamer > xDataStreamer(
rArg.Sink, uno::UNO_QUERY );
if ( xDataStreamer.is() )
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index a00763e..5c2aa05 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1896,7 +1896,6 @@ uno::Any Content::open(
// Unreachable
}
- rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
uno::Reference< io::XOutputStream > xOut
= uno::Reference< io::XOutputStream >( rArg.Sink, uno::UNO_QUERY );
if ( xOut.is() )
@@ -2639,8 +2638,6 @@ void Content::destroy( sal_Bool bDeletePhysical )
throw( uno::Exception )
{
// @@@ take care about bDeletePhysical -> trashcan support
- rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
-
uno::Reference< ucb::XContent > xThis = this;
deleted();
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index a628a0a..9696ef8 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -390,13 +390,6 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
sal_uInt32 nItem = 0 ;
sal_uInt32 nPosition = 0 ;
- OUString sName ;
-
- // We must use these one instance object(!) to get information about installed modules.
- // These information are used to filter menu entries wich need not installed modules ...
- // Such entries shouldnt be available then!
- // see impl_IsEntrySupported() too
- SvtModuleOptions aModuleOptions;
// Get names/values for new menu.
// 4 subkeys for every item!
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 4ce2748..709c52d 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1385,7 +1385,6 @@ void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
Point aPos = pDev->LogicToPixel( rPos );
Size aSize = pDev->LogicToPixel( rSize );
Rectangle aRect( aPos, aSize );
- Rectangle aTextRect;
Font aFont = GetDrawPixelFont( pDev );
pDev->Push();
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 1ee609c..487d83e 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2559,7 +2559,7 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel )
rtl::OString aLine;
sal_Bool bDone = rInput.ReadLine( aLine );
- rtl::OUString aTmpStr(rtl::OStringToOUString(aLine, rInput.GetStreamCharSet())), aStr;
+ rtl::OUString aTmpStr(rtl::OStringToOUString(aLine, rInput.GetStreamCharSet()));
while ( bDone )
{
aSel = ImpInsertText( aSel, aTmpStr );
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index 3189ba4..f0f205b 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -347,7 +347,6 @@ ImageList::ImageList( const ResId& rResId ) :
pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
sal_uLong nObjMask = pResMgr->ReadLong();
- const String aPrefix( pResMgr->ReadString() );
::boost::scoped_ptr< Color > spMaskColor;
if( nObjMask & RSC_IMAGE_MASKCOLOR )
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a73ca80..d46df66 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -445,7 +445,6 @@ void VclBuilder::handleTranslations(xmlreader::XmlReader &reader)
{
xmlreader::Span name;
int nsId;
- OString sType;
OString sID, sProperty;
@@ -1606,7 +1605,7 @@ void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal
if (name.equals("col"))
{
bool bTranslated = false;
- OString sProperty, sValue;
+ OString sValue;
sal_uInt32 nId = 0;
while (reader.nextAttribute(&nsId, &name))
@@ -1835,7 +1834,6 @@ void VclBuilder::handleMenuChild(PopupMenu *pParent, xmlreader::XmlReader &reade
{
xmlreader::Span name;
int nsId;
- OString sType;
int nLevel = 1;
while(1)
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index e6806c6..ad39943 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -196,11 +196,6 @@ ContentProvider::queryContent(
if( !m_pDatabases )
throw uno::RuntimeException();
- rtl::OUString aOUString( m_pDatabases->getInstallPathAsURL() );
- rtl::OString aOString( aOUString.getStr(),
- aOUString.getLength(),
- RTL_TEXTENCODING_UTF8 );
-
// Check, if a content with given id already exists...
uno::Reference< ucb::XContent > xContent
= queryExistingContent( xCanonicId ).get();
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 94b4763..93649f5 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -958,7 +958,6 @@ void ImageControlElement::endElement()
ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
ctx.importBooleanProperty( "ScaleImage", "scale-image", _xAttributes );
- OUString sURL = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, "src" );
Reference< document::XStorageBasedDocument > xDocStorage( _pImport->getDocOwner(), UNO_QUERY );
ctx.importImageURLProperty( "ImageURL" , "src" , _xAttributes );
More information about the Libreoffice-commits
mailing list